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# 887695 : "Services Manager in AutoYast: Presents exported data in an unreadable format" (RESOLVED/FIXED) ## BNC# 887115 : "autogenerated autoinst.xml has empty "services" sections" (ASSIGNED/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-services-manager/yast2-services-manager.changes 2014-07-16 15:37:57.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-services-manager/yast2-services-manager.changes 2014-07-21 08:50:31.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Jul 17 15:12:50 CEST 2014 - locilka@suse.com + +- Fixed AutoYast summary to show both enabled and disabled services +- Fixed reading targets - now they read in all cases except the + initial installation where systemctl doesn't work in chroot +- Fixed AutoYast schema to allow service or listentry as AutoYast + by default exports all single entries as 'listentry' +- All bnc#887695 and bnc#887115 +- 3.1.22 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-services-manager - at least 19 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:41485 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-services-manager", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-services-manager-3.1.21.tar.bz2 New: ---- yast2-services-manager-3.1.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-services-manager.spec ++++++ --- /var/tmp/diff_new_pack.4oLx8u/_old 2014-07-21 15:52:01.000000000 +0200 +++ /var/tmp/diff_new_pack.4oLx8u/_new 2014-07-21 15:52:01.000000000 +0200 @@ -24,7 +24,7 @@ ###################################################################### Name: yast2-services-manager -Version: 3.1.21 +Version: 3.1.22 Release: 0 BuildArch: noarch ++++++ yast2-services-manager-3.1.21.tar.bz2 -> yast2-services-manager-3.1.22.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.21/package/yast2-services-manager.changes new/yast2-services-manager-3.1.22/package/yast2-services-manager.changes --- old/yast2-services-manager-3.1.21/package/yast2-services-manager.changes 2014-07-14 15:15:22.000000000 +0200 +++ new/yast2-services-manager-3.1.22/package/yast2-services-manager.changes 2014-07-21 08:46:00.000000000 +0200 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Thu Jul 17 15:12:50 CEST 2014 - locilka@suse.com + +- Fixed AutoYast summary to show both enabled and disabled services +- Fixed reading targets - now they read in all cases except the + initial installation where systemctl doesn't work in chroot +- Fixed AutoYast schema to allow service or listentry as AutoYast + by default exports all single entries as 'listentry' +- All bnc#887695 and bnc#887115 +- 3.1.22 + +------------------------------------------------------------------- Mon Jul 14 10:20:39 CEST 2014 - locilka@suse.com - ServicesManagerServiceClass and ServicesManagerTargetClass diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.21/package/yast2-services-manager.spec new/yast2-services-manager-3.1.22/package/yast2-services-manager.spec --- old/yast2-services-manager-3.1.21/package/yast2-services-manager.spec 2014-07-14 15:15:22.000000000 +0200 +++ new/yast2-services-manager-3.1.22/package/yast2-services-manager.spec 2014-07-21 08:46:00.000000000 +0200 @@ -24,7 +24,7 @@ ###################################################################### Name: yast2-services-manager -Version: 3.1.21 +Version: 3.1.22 Release: 0 BuildArch: noarch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.21/src/autoyast_rnc/services-manager.rnc new/yast2-services-manager-3.1.22/src/autoyast_rnc/services-manager.rnc --- old/yast2-services-manager-3.1.21/src/autoyast_rnc/services-manager.rnc 2014-07-14 15:15:22.000000000 +0200 +++ new/yast2-services-manager-3.1.22/src/autoyast_rnc/services-manager.rnc 2014-07-21 08:46:00.000000000 +0200 @@ -30,7 +30,8 @@ # current services-manager schema -service = element service { text } +# by default, AutoYast exports list entries as 'listentry' +service = element service { text } | element listentry { text } enabled = element enabled { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.21/src/data/services-manager/autoyast_summary.erb new/yast2-services-manager-3.1.22/src/data/services-manager/autoyast_summary.erb --- old/yast2-services-manager-3.1.21/src/data/services-manager/autoyast_summary.erb 2014-07-14 15:15:22.000000000 +0200 +++ new/yast2-services-manager-3.1.22/src/data/services-manager/autoyast_summary.erb 2014-07-21 08:46:00.000000000 +0200 @@ -4,11 +4,25 @@ <h2><%= _('Services Manager') %></h2> <p><b><%= _('Default Target') %></b></p> -<p><%= ERB::Util.html_escape(ServicesManagerTarget.export) %></p> +<ul><li><%= ERB::Util.html_escape( + ServicesManagerTargetClass::BaseTargets.localize( + ServicesManagerTarget.export + ) +) %></li></ul> -<p><b><%= _('Enabled Services') %></b></p> +<% services = ServicesManagerService.export %> + +<h2><%= _('Services') %></h2> +<p><b><%= _('Enabled') %></b></p> +<ul> +<% services.fetch("enable", []).each do |service| %> + <li><%= ERB::Util.html_escape(service) %></li> +<% end %> +</ul> + +<p><b><%= _('Disabled') %></b></p> <ul> -<% ServicesManagerService.export.each do |service| %> +<% services.fetch("disable", []).each do |service| %> <li><%= ERB::Util.html_escape(service) %></li> <% end %> </ul> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.21/src/modules/services_manager_service.rb new/yast2-services-manager-3.1.22/src/modules/services_manager_service.rb --- old/yast2-services-manager-3.1.21/src/modules/services_manager_service.rb 2014-07-14 15:15:22.000000000 +0200 +++ new/yast2-services-manager-3.1.22/src/modules/services_manager_service.rb 2014-07-21 08:46:00.000000000 +0200 @@ -2,7 +2,6 @@ module Yast import "Service" - import "Mode" class ServicesManagerServiceClass < Module include Yast::Logger diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.21/src/modules/services_manager_target.rb new/yast2-services-manager-3.1.22/src/modules/services_manager_target.rb --- old/yast2-services-manager-3.1.21/src/modules/services_manager_target.rb 2014-07-14 15:15:22.000000000 +0200 +++ new/yast2-services-manager-3.1.22/src/modules/services_manager_target.rb 2014-07-21 08:46:00.000000000 +0200 @@ -1,7 +1,7 @@ require "yast" module Yast - import 'Mode' + import 'Stage' import 'SystemdTarget' class ServicesManagerTargetClass < Module @@ -79,7 +79,7 @@ @default_target = '' # Reads the data on a running system only - return true unless Mode.normal + return true if Stage.initial default_target = SystemdTarget.get_default @default_target = default_target ? default_target.name : '' @@ -100,7 +100,7 @@ end def default_target= new_default - if Mode.normal && !targets.keys.include?(new_default) + if !Stage.initial && !targets.keys.include?(new_default) raise "Target #{new_default} not found, available only #{targets.keys.join(', ')}" end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.21/test/services_manager_target_test.rb new/yast2-services-manager-3.1.22/test/services_manager_target_test.rb --- old/yast2-services-manager-3.1.21/test/services_manager_target_test.rb 2014-07-14 15:15:22.000000000 +0200 +++ new/yast2-services-manager-3.1.22/test/services_manager_target_test.rb 2014-07-21 08:46:00.000000000 +0200 @@ -43,14 +43,13 @@ expect(target.targets.keys).not_to include('sleep') end - it "skips reading targets if Mode.normal is false" do - allow(Yast::Mode).to receive(:mode).and_return("instalation") + it "skips reading targets if `Stage` is `initial`" do + allow(Yast::Stage).to receive(:stage).and_return("initial") expect(SystemdTarget).not_to receive(:all) expect(SystemdTarget).not_to receive(:get_default) target = ServicesManagerTargetClass.new expect(target.targets).to be_empty expect(target.default_target).to be_empty - Mode.SetMode('normal') end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.21/test/services_manager_test.rb new/yast2-services-manager-3.1.22/test/services_manager_test.rb --- old/yast2-services-manager-3.1.21/test/services_manager_test.rb 2014-07-14 15:15:22.000000000 +0200 +++ new/yast2-services-manager-3.1.22/test/services_manager_test.rb 2014-07-21 08:46:00.000000000 +0200 @@ -118,10 +118,13 @@ 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(["service-1", "service-<br>-2", "service-<b>name</b>-3"]) + 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-1", "service-<br>-2", "service-<b>name</b>-3"].each do |item| + ["multi-head-graphical-hydra", "service-[14]", "service-<br>-[25]", "service-<b>name</b>-[36]"].each do |item| expect(summary).to match(/#{item}/) end end continue with "q"... Checked in at Mon Jul 21 15:52:30 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