[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# 876459 : "installer reports invalid byte sequence in UTF-8" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2/yast2.changes 2014-05-30 12:15:36.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2/yast2.changes 2014-05-30 13:29:13.000000000 +0200 @@ -1,0 +2,13 @@ +Fri May 30 11:06:47 UTC 2014 - vmoravec@suse.com + +- Add Service.call method to make available all systemctl commands +- 3.1.74 + +------------------------------------------------------------------- +Fri May 30 08:55:45 UTC 2014 - lslezak@suse.cz + +- DonePackage callback: remove invalid UTF-8 characters to avoid + crash (bnc#876459) +- 3.1.73 + +------------------------------------------------------------------- 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:38746 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-3.1.72.tar.bz2 New: ---- yast2-3.1.74.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.6OyedO/_old 2014-05-30 16:59:44.000000000 +0200 +++ /var/tmp/diff_new_pack.6OyedO/_new 2014-05-30 16:59:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.72 +Version: 3.1.74 Release: 0 URL: https://github.com/yast/yast-yast2 ++++++ yast2-3.1.72.tar.bz2 -> yast2-3.1.74.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.72/library/packages/src/modules/PackageCallbacks.rb new/yast2-3.1.74/library/packages/src/modules/PackageCallbacks.rb --- old/yast2-3.1.72/library/packages/src/modules/PackageCallbacks.rb 2014-05-30 10:50:27.000000000 +0200 +++ new/yast2-3.1.74/library/packages/src/modules/PackageCallbacks.rb 2014-05-30 13:17:13.000000000 +0200 @@ -35,6 +35,8 @@ module Yast class PackageCallbacksClass < Module + include Yast::Logger + def main Yast.import "Pkg" Yast.import "UI" @@ -567,6 +569,14 @@ # return "R" for retry # return "C" for abort (not implemented !) def DonePackage(error, reason) + + # remove invalid characters (bnc#876459) + if !reason.valid_encoding? + reason.encode!('UTF-16', :undef => :replace, :invalid => :replace, :replace => "?") + reason.encode!('UTF-8') + log.warn "Invalid byte sequence found, fixed text: #{reason}" + end + UI.CloseDialog if @_package_popup @_package_popup = false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.72/library/runlevel/src/modules/Service.rb new/yast2-3.1.74/library/runlevel/src/modules/Service.rb --- old/yast2-3.1.72/library/runlevel/src/modules/Service.rb 2014-05-30 10:50:27.000000000 +0200 +++ new/yast2-3.1.74/library/runlevel/src/modules/Service.rb 2014-05-30 13:17:13.000000000 +0200 @@ -50,6 +50,35 @@ @error = "" end + # Send whatever systemd command you need to call for a specific service + # If the command fails, log entry with output from systemctl is created in y2log + # @param [String,String] Command name and service name + # @return [Boolean] Result of the action, true means success + def call command_name, service_name + service = SystemdService.find(service_name) + return failure(:not_found, service_name) unless service + + systemd_command = + case command_name + when 'show' then :show + when 'status' then :status + when 'start' then :start + when 'stop' then :stop + when 'enable' then :enable + when 'disable' then :disable + when 'restart' then :restart + when 'reload' then :reload + when 'try-restart' then :try_restart + when 'reload-or-restart' then :reload_or_restart + when 'reload-or-try-restart' then :reload_or_try_restart + else + raise "Command '#{command_name}' not supported" + end + result = service.send(systemd_command) + failure(command_name, service_name, service.error) unless result + result + end + # Check if service is active/running # # @param [String] name service name @@ -75,6 +104,7 @@ alias_method :enabled?, :Enabled # Enable service + # Logs error with output from systemctl if the command fails # @param [String] service service to be enabled # @return true if operation is successful def Enable service_name @@ -88,6 +118,7 @@ alias_method :enable, :Enable # Disable service + # Logs error with output from systemctl if the command fails # @param [String] service service to be disabled # @return true if operation is successful def Disable service_name @@ -101,6 +132,7 @@ alias_method :disable, :Disable # Start service + # Logs error with output from systemctl if the command fails # @param [String] service service to be started # @return true if operation is successful def Start service_name @@ -114,6 +146,7 @@ alias_method :start, :Start # Restart service + # Logs error with output from systemctl if the command fails # @param [String] service service to be restarted # @return true if operation is successful def Restart service_name @@ -127,6 +160,7 @@ alias_method :restart, :Restart # Reload service + # Logs error with output from systemctl if the command fails # @param [String] service service to be reloaded # @return true if operation is successful def Reload service_name @@ -140,6 +174,7 @@ alias_method :reload, :Reload # Stop service + # Logs error with output from systemctl if the command fails # @param [String] service service to be stopped # @return true if operation is successful def Stop service_name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.72/library/runlevel/test/service_test.rb new/yast2-3.1.74/library/runlevel/test/service_test.rb --- old/yast2-3.1.72/library/runlevel/test/service_test.rb 2014-05-30 10:50:27.000000000 +0200 +++ new/yast2-3.1.74/library/runlevel/test/service_test.rb 2014-05-30 13:17:13.000000000 +0200 @@ -20,6 +20,28 @@ stub_services end + describe ".call" do + it "executes the command for the specified service" do + expect(Service.call('reload', 'sshd')).to be_true + end + + it "returns false if the service has not been found" do + stub_services(:service=>'unknown') + expect(Service.call('restart', 'unknown')).to be_false + end + + it "raises error if the command is not recognized" do + expect { Service.call('make-coffee', 'sshd') }.to raise_error + end + + it "returns the result of the original result of the command call" do + expect(Service.call('status', 'sshd')).to be_kind_of(String) + + stub_service_with(:"try_restart", false) + expect(Service.call('try-restart', "sshd")).to be_false + end + end + describe ".Active" do it "returns true if a service is active" do expect(Service.Active('sshd')).to be_true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.72/library/systemd/src/modules/systemd_service.rb new/yast2-3.1.74/library/systemd/src/modules/systemd_service.rb --- old/yast2-3.1.72/library/systemd/src/modules/systemd_service.rb 2014-05-30 10:50:27.000000000 +0200 +++ new/yast2-3.1.74/library/systemd/src/modules/systemd_service.rb 2014-05-30 13:17:13.000000000 +0200 @@ -116,6 +116,9 @@ end def restart + # Delegate to SystemdUnit#restart if not within installation + return super unless installation_system? + stop sleep(1) start diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.72/package/yast2.changes new/yast2-3.1.74/package/yast2.changes --- old/yast2-3.1.72/package/yast2.changes 2014-05-30 10:50:28.000000000 +0200 +++ new/yast2-3.1.74/package/yast2.changes 2014-05-30 13:17:13.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Fri May 30 11:06:47 UTC 2014 - vmoravec@suse.com + +- Add Service.call method to make available all systemctl commands +- 3.1.74 + +------------------------------------------------------------------- +Fri May 30 08:55:45 UTC 2014 - lslezak@suse.cz + +- DonePackage callback: remove invalid UTF-8 characters to avoid + crash (bnc#876459) +- 3.1.73 + +------------------------------------------------------------------- Fri May 30 10:41:14 CEST 2014 - locilka@suse.com - Fixed network backend handling during upgrade - unified with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.72/package/yast2.spec new/yast2-3.1.74/package/yast2.spec --- old/yast2-3.1.72/package/yast2.spec 2014-05-30 10:50:28.000000000 +0200 +++ new/yast2-3.1.74/package/yast2.spec 2014-05-30 13:17:13.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.72 +Version: 3.1.74 Release: 0 URL: https://github.com/yast/yast-yast2 continue with "q"... Checked in at Fri May 30 16:59:59 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