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-services-manager -> sle12 ## BNC# 884756 : "[RC1 blocker] autoyast second stage does not finish" (RESOLVED/FIXED) ## BNC# 887694 : "Services Manager in AutoYast: pretends to be cloned by default but exports no data" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-services-manager/yast2-services-manager.changes 2014-07-23 16:47:35.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-services-manager/yast2-services-manager.changes 2014-07-24 12:09:46.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Jul 24 11:55:32 CEST 2014 - locilka@suse.com + +- While saving services state (activate/deactivate), do not touch + a service, that is already in the desired state (bnc#884756) +- 3.1.26 + +------------------------------------------------------------------- +Wed Jul 23 18:51:57 CEST 2014 - locilka@suse.com + +- Showing info that Services Manager hasn't been configured yet in + AutoYast till it's cloned from the system or user enters + the module and saves its configuration (bnc#887694) +- 3.1.25 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-services-manager - at least 20 other packages ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-services-manager (Old) and /mounts/work_src_done/SLE12/yast2-services-manager (BS:build ID:41730 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-services-manager", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-services-manager-3.1.24.tar.bz2 New: ---- yast2-services-manager-3.1.26.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-services-manager.spec ++++++ --- /var/tmp/diff_new_pack.ojHY01/_old 2014-07-24 18:12:23.000000000 +0200 +++ /var/tmp/diff_new_pack.ojHY01/_new 2014-07-24 18:12:23.000000000 +0200 @@ -24,7 +24,7 @@ ###################################################################### Name: yast2-services-manager -Version: 3.1.24 +Version: 3.1.26 Release: 0 BuildArch: noarch ++++++ yast2-services-manager-3.1.24.tar.bz2 -> yast2-services-manager-3.1.26.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.24/package/yast2-services-manager.changes new/yast2-services-manager-3.1.26/package/yast2-services-manager.changes --- old/yast2-services-manager-3.1.24/package/yast2-services-manager.changes 2014-07-23 13:11:08.000000000 +0200 +++ new/yast2-services-manager-3.1.26/package/yast2-services-manager.changes 2014-07-24 12:05:57.000000000 +0200 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Thu Jul 24 11:55:32 CEST 2014 - locilka@suse.com + +- While saving services state (activate/deactivate), do not touch + a service, that is already in the desired state (bnc#884756) +- 3.1.26 + +------------------------------------------------------------------- +Wed Jul 23 18:51:57 CEST 2014 - locilka@suse.com + +- Showing info that Services Manager hasn't been configured yet in + AutoYast till it's cloned from the system or user enters + the module and saves its configuration (bnc#887694) +- 3.1.25 + +------------------------------------------------------------------- Tue Jul 22 15:01:52 CEST 2014 - locilka@suse.com - Using new library ServicesProposal, that holds information about diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.24/package/yast2-services-manager.spec new/yast2-services-manager-3.1.26/package/yast2-services-manager.spec --- old/yast2-services-manager-3.1.24/package/yast2-services-manager.spec 2014-07-23 13:11:08.000000000 +0200 +++ new/yast2-services-manager-3.1.26/package/yast2-services-manager.spec 2014-07-24 12:05:57.000000000 +0200 @@ -24,7 +24,7 @@ ###################################################################### Name: yast2-services-manager -Version: 3.1.24 +Version: 3.1.26 Release: 0 BuildArch: noarch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.24/src/modules/services_manager.rb new/yast2-services-manager-3.1.26/src/modules/services_manager.rb --- old/yast2-services-manager-3.1.24/src/modules/services_manager.rb 2014-07-23 13:11:09.000000000 +0200 +++ new/yast2-services-manager-3.1.26/src/modules/services_manager.rb 2014-07-24 12:05:57.000000000 +0200 @@ -27,8 +27,13 @@ end def auto_summary - erb_template = File.expand_path("../../data/services-manager/autoyast_summary.erb", __FILE__) - ERB.new(File.read(erb_template)).result(binding) + if !modified? + # AutoYast summary + _("Not configured yet.") + else + erb_template = File.expand_path("../../data/services-manager/autoyast_summary.erb", __FILE__) + ERB.new(File.read(erb_template)).result(binding) + end end def import data diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.24/src/modules/services_manager_service.rb new/yast2-services-manager-3.1.26/src/modules/services_manager_service.rb --- old/yast2-services-manager-3.1.24/src/modules/services_manager_service.rb 2014-07-23 13:11:09.000000000 +0200 +++ new/yast2-services-manager-3.1.26/src/modules/services_manager_service.rb 2014-07-24 12:05:57.000000000 +0200 @@ -3,6 +3,7 @@ module Yast import "Service" import "ServicesProposal" + import "SystemdService" class ServicesManagerServiceClass < Module include Yast::Logger @@ -382,11 +383,23 @@ end def switch_services - Builtins.y2milestone "Switching the services" + log.info "Switching services" services_switched = [] + services.each do |service_name, service_attributes| next unless service_attributes[:modified] - if switch!(service_name) + + service = SystemdService.find(service_name) + unless service + log.error "Cannot find service #{service_name}" + next + end + + # Do not start or stop services that are already in the desired state + # they might be coming from AutoYast import and thus they are :modified. + if service.loaded? == service_attributes[:loaded] || service.active? == service_attributes[:active] + log.info "Skipping service #{service_name} - it's already in desired state" + elsif switch!(service_name) services_switched << service_name else change = active(service_name) ? 'stop' : 'start' @@ -398,6 +411,7 @@ Builtins.y2error("Error: %1", message) end end + services_switched end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.24/test/services_manager_test.rb new/yast2-services-manager-3.1.26/test/services_manager_test.rb --- old/yast2-services-manager-3.1.24/test/services_manager_test.rb 2014-07-23 13:11:09.000000000 +0200 +++ new/yast2-services-manager-3.1.26/test/services_manager_test.rb 2014-07-24 12:05:57.000000000 +0200 @@ -6,6 +6,9 @@ Yast.import 'ServicesManagerTarget' Yast.import 'ServicesManager' + extend Yast::I18n + Yast::textdomain "services-manager" + TARGETS = { "multi-user"=>{ :enabled=>true, :loaded=>true, :active=>true, :description=>"Multi-User System" @@ -120,16 +123,26 @@ end end - it "returns HTML-formatted autoyast summary with HTML-escaped values" do - expect(ServicesManagerTarget).to receive(:export).and_return("multi-head-graphical-hydra") - expect(ServicesManagerService).to receive(:export).and_return({ - "enable" => ["service-1", "service-<br>-2", "service-<b>name</b>-3"], - "disable" => ["service-4", "service-<br>-5", "service-<b>name</b>-6"], - }) - - summary = ServicesManager.auto_summary - ["multi-head-graphical-hydra", "service-[14]", "service-<br>-[25]", "service-<b>name</b>-[36]"].each do |item| - expect(summary).to match(/#{item}/) + context "when configuration hasn't been cloned/modified" do + it "returns information that it hasn't been configured yet" do + expect(ServicesManager).to receive(:modified?).and_return(false) + expect(ServicesManager.auto_summary).to eq(Yast::_("Not configured yet.")) + end + end + + context "when configuration has been cloned/modified" do + it "returns HTML-formatted autoyast summary with HTML-escaped values" do + expect(ServicesManager).to receive(:modified?).and_return(true) + expect(ServicesManagerTarget).to receive(:export).and_return("multi-head-graphical-hydra") + expect(ServicesManagerService).to receive(:export).and_return({ + "enable" => ["service-1", "service-<br>-2", "service-<b>name</b>-3"], + "disable" => ["service-4", "service-<br>-5", "service-<b>name</b>-6"], + }) + + summary = ServicesManager.auto_summary + ["multi-head-graphical-hydra", "service-[14]", "service-<br>-[25]", "service-<b>name</b>-[36]"].each do |item| + expect(summary).to match(/#{item}/) + end end end end continue with "q"... Checked in at Thu Jul 24 18:12:35 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