Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2022-09-30 17:57:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Fri Sep 30 17:57:09 2022 rev:540 rq:1006698 version:4.5.15 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2022-09-17 20:10:12.641134487 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new.2275/yast2.changes 2022-09-30 17:57:22.669195174 +0200 @@ -1,0 +2,6 @@ +Wed Sep 28 12:22:59 UTC 2022 - Ancor Gonzalez Sosa <an...@suse.com> + +- Better detection of YaST2 Journal (related to bsc#1199840). +- 4.5.15 + +------------------------------------------------------------------- Old: ---- yast2-4.5.14.tar.bz2 New: ---- yast2-4.5.15.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.pC5YTV/_old 2022-09-30 17:57:23.329196585 +0200 +++ /var/tmp/diff_new_pack.pC5YTV/_new 2022-09-30 17:57:23.333196594 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 4.5.14 +Version: 4.5.15 Release: 0 Summary: YaST2 Main Package ++++++ yast2-4.5.14.tar.bz2 -> yast2-4.5.15.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.5.14/library/system/src/lib/yast2/clients/view_anymsg.rb new/yast2-4.5.15/library/system/src/lib/yast2/clients/view_anymsg.rb --- old/yast2-4.5.14/library/system/src/lib/yast2/clients/view_anymsg.rb 2022-09-16 12:22:45.000000000 +0200 +++ new/yast2-4.5.15/library/system/src/lib/yast2/clients/view_anymsg.rb 2022-09-28 16:02:19.000000000 +0200 @@ -165,10 +165,16 @@ focus: :no ) == :yes - res && Package.Install("yast2-journal") + res && journal_client? end end + # Tries to ensure the 'journal' client is available, even installing additional + # packages if needed + def journal_client? + WFM.ClientExists("journal") || Package.Install("yast2-journal") + end + def dialog_content VBox( HSpacing(70), # force width diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.5.14/library/system/test/clients/view_anymsg_test.rb new/yast2-4.5.15/library/system/test/clients/view_anymsg_test.rb --- old/yast2-4.5.14/library/system/test/clients/view_anymsg_test.rb 2022-09-16 12:22:45.000000000 +0200 +++ new/yast2-4.5.15/library/system/test/clients/view_anymsg_test.rb 2022-09-28 16:02:19.000000000 +0200 @@ -180,25 +180,48 @@ before do allow(Yast::Package).to receive(:Install).and_return(true) allow(Yast2::Popup).to receive(:show).and_return(:yes) + allow(Yast::WFM).to receive(:ClientExists).and_return(client_exists) allow_any_instance_of(Yast::ViewAnymsgClient).to receive(:file_state).and_return(:missing) end + let(:client_exists) { true } + it "ask to open journal instead" do expect(Yast2::Popup).to receive(:show).with(/does not exist/, any_args) subject.main end - it "ensures yast2-journal is installed" do - expect(Yast::Package).to receive(:Install).and_return(true) + context "if the journal client is already available" do + let(:client_exists) { true } - subject.main + it "does not try to install yast2-journal" do + expect(Yast::Package).to_not receive(:Install) + + subject.main + end + + it "switches to yast2-journal module if user wants it" do + expect(Yast::WFM).to receive(:CallFunction).with("journal") + + subject.main + end end - it "switches to yast2-journal module if user wants it and all goes well" do - expect(Yast::WFM).to receive(:CallFunction).with("journal") + context "if the journal client is not available" do + let(:client_exists) { false } - subject.main + it "installs yast2-journal" do + expect(Yast::Package).to receive(:Install).with(/journal/).and_return(true) + + subject.main + end + + it "switches to yast2-journal module if user wants it and all goes well" do + expect(Yast::WFM).to receive(:CallFunction).with("journal") + + subject.main + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.5.14/package/yast2.changes new/yast2-4.5.15/package/yast2.changes --- old/yast2-4.5.14/package/yast2.changes 2022-09-16 12:22:45.000000000 +0200 +++ new/yast2-4.5.15/package/yast2.changes 2022-09-28 16:02:19.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Sep 28 12:22:59 UTC 2022 - Ancor Gonzalez Sosa <an...@suse.com> + +- Better detection of YaST2 Journal (related to bsc#1199840). +- 4.5.15 + +------------------------------------------------------------------- Fri Sep 16 10:12:41 UTC 2022 - Michal Filka <mfi...@suse.com> - bsc#1200016 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.5.14/package/yast2.spec new/yast2-4.5.15/package/yast2.spec --- old/yast2-4.5.14/package/yast2.spec 2022-09-16 12:22:45.000000000 +0200 +++ new/yast2-4.5.15/package/yast2.spec 2022-09-28 16:02:19.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 4.5.14 +Version: 4.5.15 Release: 0 Summary: YaST2 Main Package