[yast-commit] [ci_new_pac] JFYI yast2 -> sle12
Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2 -> sle12 ## BNC# 875605 : "[UPGRADE] YaST2 cannot find base product" (RESOLVED/FIXED) ## BNC# 873057 : "iSCSI Boot - Fails to boot after Installation" (ASSIGNED/) ## BNC# 873448 : "first reboot fails with software iscsi" (ASSIGNED/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2/yast2.changes 2014-04-29 11:47:30.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2/yast2.changes 2014-04-30 08:47:56.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Apr 29 12:46:18 CEST 2014 - locilka@suse.com + +- Fixed Product lazy loading in Update mode (bnc#875605) +- 3.1.57 + +------------------------------------------------------------------- +Tue Apr 29 11:27:09 CEST 2014 - gs@suse.de + +- Add support for 'stop' and 'restart' of services in inst-sys + (related to bnc #873057, bnc #873448) +- 3.1.56 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2 - at least 73 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2 (Old) and /mounts/work_src_done/SLE12/yast2 (BS:build ID:37021 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-3.1.55.tar.bz2 New: ---- yast2-3.1.57.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.2QDYTm/_old 2014-04-30 12:56:34.000000000 +0200 +++ /var/tmp/diff_new_pack.2QDYTm/_new 2014-04-30 12:56:34.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.55 +Version: 3.1.57 Release: 0 URL: https://github.com/yast/yast-yast2 ++++++ yast2-3.1.55.tar.bz2 -> yast2-3.1.57.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.55/library/packages/src/modules/Product.rb new/yast2-3.1.57/library/packages/src/modules/Product.rb --- old/yast2-3.1.55/library/packages/src/modules/Product.rb 2014-04-29 08:35:52.000000000 +0200 +++ new/yast2-3.1.57/library/packages/src/modules/Product.rb 2014-04-30 08:40:53.000000000 +0200 @@ -154,12 +154,12 @@ # Is it possible to use os-release file? def can_use_os_release_file? - !Stage.initial && !Mode.installation && OSRelease.os_release_exists? + !Stage.initial && OSRelease.os_release_exists? end # Whether to use :installed or :selected products def use_installed_products? - !Mode.installation || Mode.live_installation + !Stage.initial end # Ensures that we can load data from libzypp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.55/library/packages/test/product_test.rb new/yast2-3.1.57/library/packages/test/product_test.rb --- old/yast2-3.1.55/library/packages/test/product_test.rb 2014-04-29 08:35:52.000000000 +0200 +++ new/yast2-3.1.57/library/packages/test/product_test.rb 2014-04-30 08:40:53.000000000 +0200 @@ -52,17 +52,30 @@ stub_defaults end - context "while called in installation without os-release file" do + context "while called in installation system without os-release file" do before(:each) do Yast::Stage.stub(:stage).and_return("initial") - Yast::Mode.stub(:mode).and_return("installation") Yast::OSRelease.stub(:os_release_exists?).and_return(false) end - it "reads product information from zypp and fills up internal variables" do - expect(Yast::Product.name).to eq("openSUSE (SELECTED)") - expect(Yast::Product.short_name).to eq("openSUSE") - expect(Yast::Product.version).to eq("13.1") + describe "when the mode is Installation" do + it "reads product information from zypp and fills up internal variables" do + Yast::Mode.stub(:mode).and_return("installation") + + expect(Yast::Product.name).to eq("openSUSE (SELECTED)") + expect(Yast::Product.short_name).to eq("openSUSE") + expect(Yast::Product.version).to eq("13.1") + end + end + + describe "when the mode is Update" do + it "reads product information from zypp and fills up internal variables" do + Yast::Mode.stub(:mode).and_return("update") + + expect(Yast::Product.name).to eq("openSUSE (SELECTED)") + expect(Yast::Product.short_name).to eq("openSUSE") + expect(Yast::Product.version).to eq("13.1") + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.55/library/systemd/src/modules/systemd_service.rb new/yast2-3.1.57/library/systemd/src/modules/systemd_service.rb --- old/yast2-3.1.55/library/systemd/src/modules/systemd_service.rb 2014-04-29 08:35:53.000000000 +0200 +++ new/yast2-3.1.57/library/systemd/src/modules/systemd_service.rb 2014-04-30 08:40:53.000000000 +0200 @@ -106,18 +106,35 @@ end def start - if File.exist?(START_SERVICE_INSTSYS_COMMAND) - command = "#{START_SERVICE_INSTSYS_COMMAND} #{unit_name}" - log.info("Running command '#{command}'") - error.clear - result = OpenStruct.new( - SCR.Execute(Path.new(".target.bash_output"), command) - ) - error << result.stderr - result.exit.zero? - else - super - end + command = "#{START_SERVICE_INSTSYS_COMMAND} #{unit_name}" + installation_system? ? run_instsys_command(command) : super + end + + def stop + command = "#{START_SERVICE_INSTSYS_COMMAND} --stop #{unit_name}" + installation_system? ? run_instsys_command(command) : super + end + + def restart + stop + sleep(1) + start + end + + private + + def installation_system? + File.exist?(START_SERVICE_INSTSYS_COMMAND) + end + + def run_instsys_command command + log.info("Running command '#{command}'") + error.clear + result = OpenStruct.new( + SCR.Execute(Path.new(".target.bash_output"), command) + ) + error << result.stderr + result.exit.zero? end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.55/library/systemd/test/systemd_service_test.rb new/yast2-3.1.57/library/systemd/test/systemd_service_test.rb --- old/yast2-3.1.55/library/systemd/test/systemd_service_test.rb 2014-04-29 08:35:53.000000000 +0200 +++ new/yast2-3.1.57/library/systemd/test/systemd_service_test.rb 2014-04-30 08:40:53.000000000 +0200 @@ -77,5 +77,28 @@ expect(service.start).to be_true end end + + context "Restart a service on the installation system" do + it "restarts a service with a specialized inst-sys helper if available" do + SystemdServiceClass::Service.any_instance.stub(:sleep).and_return(1) + File.stub(:exist?).with('/bin/service_start').and_return(true) + service = SystemdService.find("sshd") + SCR.stub(:Execute).and_return({'stderr'=>'', 'stdout'=>'', 'exit'=>0}) + expect(service).to receive(:stop).ordered.and_call_original + expect(service).to receive(:start).ordered.and_call_original + expect(service).not_to receive(:command) # SystemdUnit#command + expect(service.restart).to be_true + end + end + + context "Stop a service on the installation system" do + it "stops a service with a specialized inst-sys helper" do + File.stub(:exist?).with('/bin/service_start').and_return(true) + service = SystemdService.find("sshd") + SCR.stub(:Execute).and_return({'stderr'=>'', 'stdout'=>'', 'exit'=>0}) + expect(service).not_to receive(:command) # SystemdUnit#command + expect(service.stop).to be_true + end + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.55/package/yast2.changes new/yast2-3.1.57/package/yast2.changes --- old/yast2-3.1.55/package/yast2.changes 2014-04-29 08:35:53.000000000 +0200 +++ new/yast2-3.1.57/package/yast2.changes 2014-04-30 08:40:53.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Tue Apr 29 12:46:18 CEST 2014 - locilka@suse.com + +- Fixed Product lazy loading in Update mode (bnc#875605) +- 3.1.57 + +------------------------------------------------------------------- +Tue Apr 29 11:27:09 CEST 2014 - gs@suse.de + +- Add support for 'stop' and 'restart' of services in inst-sys + (related to bnc #873057, bnc #873448) +- 3.1.56 + +------------------------------------------------------------------- Mon Apr 28 16:41:57 CEST 2014 - locilka@suse.com - Fixed SlideShow table header to match the reality (bnc#874823) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.55/package/yast2.spec new/yast2-3.1.57/package/yast2.spec --- old/yast2-3.1.55/package/yast2.spec 2014-04-29 08:35:53.000000000 +0200 +++ new/yast2-3.1.57/package/yast2.spec 2014-04-30 08:40:53.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.55 +Version: 3.1.57 Release: 0 URL: https://github.com/yast/yast-yast2 continue with "q"... Checked in at Wed Apr 30 12:56:57 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
ro