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# 873973 : "Enabling LSB service from yast fails during installation" (RESOLVED/FIXED) ## BNC# 873929 : "Systemd deprecation warning in yast logs" (RESOLVED/FIXED) ## BNC# 873916 : "Unable to Call "Blacklist devices" from the installation proposal (build 274)" (RESOLVED/FIXED) ## BNC# 869661 : "[Upgrade] Internal Error: Cannot detect used network service" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2/yast2.changes 2014-04-15 10:13:30.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2/yast2.changes 2014-04-17 11:27:01.000000000 +0200 @@ -1,0 +2,29 @@ +Thu Apr 17 11:11:01 CEST 2014 - locilka@suse.com + +- Decreased number of logs coming from Hooks (to enhance logs + readability) +- 3.1.50 + +------------------------------------------------------------------- +Thu Apr 17 08:22:23 UTC 2014 - vmoravec@suse.com + +- Add path to deprecation warnings (bnc#873973) +- Fix enabling LSB services during installation (bnc#873929) +- 3.1.49 + +------------------------------------------------------------------- +Wed Apr 16 13:02:54 UTC 2014 - jreidinger@suse.com + +- ensure that dialog was closed even if exception is raised + (bnc#873916) +- save_y2logs: store versions of packages in inst-sys +- 3.1.48 + +------------------------------------------------------------------- +Wed Apr 16 11:46:55 UTC 2014 - mfilka@suse.com + +- bnc#869661 + - fixed internal error raised in inst_lan during update +- 3.1.47 + +------------------------------------------------------------------- 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:36491 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-3.1.46.tar.bz2 New: ---- yast2-3.1.50.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.6NP9cK/_old 2014-04-17 14:14:40.000000000 +0200 +++ /var/tmp/diff_new_pack.6NP9cK/_new 2014-04-17 14:14:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.46 +Version: 3.1.50 Release: 0 URL: https://github.com/yast/yast-yast2 ++++++ yast2-3.1.46.tar.bz2 -> yast2-3.1.50.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.46/library/cwm/src/modules/DialogTree.rb new/yast2-3.1.50/library/cwm/src/modules/DialogTree.rb --- old/yast2-3.1.46/library/cwm/src/modules/DialogTree.rb 2014-04-15 09:28:36.000000000 +0200 +++ new/yast2-3.1.50/library/cwm/src/modules/DialogTree.rb 2014-04-17 11:18:29.000000000 +0200 @@ -292,9 +292,9 @@ # @return [Symbol] wizard sequencer symbol def RunAndHide(settings) settings = deep_copy(settings) - ret = Run(settings) + Run(settings) + ensure UI.CloseDialog - ret end # Display the dialog and run its event loop diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.46/library/cwm/src/modules/TablePopup.rb new/yast2-3.1.50/library/cwm/src/modules/TablePopup.rb --- old/yast2-3.1.46/library/cwm/src/modules/TablePopup.rb 2014-04-15 09:28:36.000000000 +0200 +++ new/yast2-3.1.50/library/cwm/src/modules/TablePopup.rb 2014-04-17 11:18:29.000000000 +0200 @@ -503,16 +503,19 @@ HSpacing(1) ) UI.OpenDialog(widget) - UI.SetFocus(Id(:optname)) - ret = nil - option = nil - while ret != :_tp_ok && ret != :_tp_cancel - ret = UI.UserInput - if ret == :_tp_ok - option = Convert.to_string(UI.QueryWidget(Id(:optname), :Value)) + begin + UI.SetFocus(Id(:optname)) + ret = nil + option = nil + while ret != :_tp_ok && ret != :_tp_cancel + ret = UI.UserInput + if ret == :_tp_ok + option = Convert.to_string(UI.QueryWidget(Id(:optname), :Value)) + end end + ensure + UI.CloseDialog end - UI.CloseDialog return nil if ret == :_tp_cancel return option if Ops.get(known_keys, option, false) Ops.get(val2key, option, option) @@ -563,54 +566,56 @@ HSpacing(1) ) UI.OpenDialog(contents) - if Ops.get(popup_descr, "init") != nil - toEval = Convert.convert( - Ops.get(popup_descr, "init"), - :from => "any", - :to => "void (any, string)" - ) - toEval.call(opt_id, opt_key) - end - ret = nil - event_descr = {} - while ret != :_tp_ok && ret != :_tp_cancel - event_descr2 = UI.WaitForEvent - event_descr2 = { "ID" => :_tp_ok } if Mode.test - ret = Ops.get(event_descr2, "ID") - if Ops.get(popup_descr, "handle") != nil + begin + if Ops.get(popup_descr, "init") != nil toEval = Convert.convert( - Ops.get(popup_descr, "handle"), + Ops.get(popup_descr, "init"), :from => "any", - :to => "void (any, string, map)" + :to => "void (any, string)" ) - toEval.call(opt_id, opt_key, event_descr2) + toEval.call(opt_id, opt_key) end - if ret == :_tp_ok - val_type = Ops.get_symbol(popup_descr, "validate_type") - if val_type == :function + ret = nil + event_descr = {} + while ret != :_tp_ok && ret != :_tp_cancel + event_descr2 = UI.WaitForEvent + event_descr2 = { "ID" => :_tp_ok } if Mode.test + ret = Ops.get(event_descr2, "ID") + if Ops.get(popup_descr, "handle") != nil toEval = Convert.convert( - Ops.get(popup_descr, "validate_function"), + Ops.get(popup_descr, "handle"), :from => "any", - :to => "boolean (any, string, map)" + :to => "void (any, string, map)" ) - if toEval != nil - ret = nil if !toEval.call(opt_id, opt_key, event_descr2) + toEval.call(opt_id, opt_key, event_descr2) + end + if ret == :_tp_ok + val_type = Ops.get_symbol(popup_descr, "validate_type") + if val_type == :function + toEval = Convert.convert( + Ops.get(popup_descr, "validate_function"), + :from => "any", + :to => "boolean (any, string, map)" + ) + if toEval != nil + ret = nil if !toEval.call(opt_id, opt_key, event_descr2) + end + elsif !CWM.validateWidget(popup_descr, event_descr2, opt_key) + ret = nil end - elsif !CWM.validateWidget(popup_descr, event_descr2, opt_key) - ret = nil end end + if ret == :_tp_ok && Ops.get(popup_descr, "store") != nil + toEval = Convert.convert( + Ops.get(popup_descr, "store"), + :from => "any", + :to => "void (any, string)" + ) + toEval.call(opt_id, opt_key) + end + ensure + UI.CloseDialog end - if ret == :_tp_ok && Ops.get(popup_descr, "store") != nil - toEval = Convert.convert( - Ops.get(popup_descr, "store"), - :from => "any", - :to => "void (any, string)" - ) - toEval.call(opt_id, opt_key) - end - - UI.CloseDialog Convert.to_symbol(ret) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.46/library/general/src/modules/Hooks.rb new/yast2-3.1.50/library/general/src/modules/Hooks.rb --- old/yast2-3.1.46/library/general/src/modules/Hooks.rb 2014-04-15 09:28:36.000000000 +0200 +++ new/yast2-3.1.50/library/general/src/modules/Hooks.rb 2014-04-17 11:18:29.000000000 +0200 @@ -1,5 +1,6 @@ require 'pathname' require 'ostruct' +require 'yast' ## Description # @@ -59,6 +60,8 @@ module Yast class HooksClass < Module + include Yast::Logger + attr_reader :hooks, :last, :search_path private :hooks @@ -94,7 +97,7 @@ def create hook_name, source_file if hooks[hook_name] - Builtins.y2warning "Hook '#{hook_name}' has already been run from #{hooks[hook_name].caller_path}" + log.warn "Hook '#{hook_name}' has already been run from #{hooks[hook_name].caller_path}" hooks[hook_name] else hooks[hook_name] = Hook.new(hook_name, source_file, search_path) @@ -146,15 +149,17 @@ end class Hook + include Yast::Logger + attr_reader :name, :results, :files, :caller_path, :search_path def initialize name, caller_path, search_path + log.debug "Creating hook '#{name}' from '#{self.caller_path}'" search_path.verify! @search_path = search_path @name = name @files = find_hook_files(name).map {|path| HookFile.new(path) } @caller_path = caller_path.split(':in').first - Builtins.y2milestone "Creating hook '#{name}' from '#{self.caller_path}'" end def execute @@ -181,17 +186,21 @@ private def find_hook_files hook_name - Builtins.y2milestone "Searching for hook files in '#{search_path}'..." + log.debug "Searching for hook files in '#{search_path}'..." hook_files = search_path.children.select do |file| file.basename.fnmatch?("#{hook_name}_[0-9][0-9]_*") end - Builtins.y2milestone "Found #{hook_files.size} hook files: " + - "#{hook_files.map {|f| f.basename.to_s}.join(', ')}" + unless hook_files.empty? + log.info "Found #{hook_files.size} hook files: " + + "#{hook_files.map {|f| f.basename.to_s}.join(', ')}" + end hook_files.sort end end class HookFile + include Yast::Logger + attr_reader :path, :content, :result def initialize path @@ -199,10 +208,10 @@ end def execute - Builtins.y2milestone "Executing hook file '#{path}'" + log.info "Executing hook file '#{path}'" @result = OpenStruct.new(SCR.Execute(Path.new(".target.bash_output"), path.to_s)) if failed? - Builtins.y2error "Hook file '#{path.basename}' failed with stderr: #{result.stderr}" + log.error "Hook file '#{path.basename}' failed with stderr: #{result.stderr}" end result end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.46/library/network/src/modules/NetworkService.rb new/yast2-3.1.50/library/network/src/modules/NetworkService.rb --- old/yast2-3.1.46/library/network/src/modules/NetworkService.rb 2014-04-15 09:28:36.000000000 +0200 +++ new/yast2-3.1.50/library/network/src/modules/NetworkService.rb 2014-04-17 11:18:29.000000000 +0200 @@ -179,7 +179,7 @@ when "wicked" @current_name = :wicked else - if Mode.installation || Mode.config + if running_installer? Builtins.y2milestone("Running in installer, use default: wicked") @current_name = :wicked else @@ -420,6 +420,11 @@ nil end + # Check if currently runs in installer + def running_installer? + Mode.installation || Mode.config || Mode.update + end + publish :function => :Read, :type => "void ()" publish :function => :Modified, :type => "boolean ()" publish :function => :is_backend_available, :type => "boolean (symbol)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.46/library/runlevel/src/modules/Service.rb new/yast2-3.1.50/library/runlevel/src/modules/Service.rb --- old/yast2-3.1.46/library/runlevel/src/modules/Service.rb 2014-04-15 09:28:36.000000000 +0200 +++ new/yast2-3.1.50/library/runlevel/src/modules/Service.rb 2014-04-17 11:18:29.000000000 +0200 @@ -412,7 +412,7 @@ def deprecate message - log.warn "[DEPRECIATION] #{caller[0].split.last} is deprecated; #{message}" + log.warn "[DEPRECATION] #{caller[0].split.last} in \"#{caller[1]}\" is deprecated; #{message}" end publish :function => :GetUnitId, :type => "string (string)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.46/library/systemd/src/lib/yast2/systemd_unit.rb new/yast2-3.1.50/library/systemd/src/lib/yast2/systemd_unit.rb --- old/yast2-3.1.46/library/systemd/src/lib/yast2/systemd_unit.rb 2014-04-15 09:28:36.000000000 +0200 +++ new/yast2-3.1.50/library/systemd/src/lib/yast2/systemd_unit.rb 2014-04-17 11:18:29.000000000 +0200 @@ -66,7 +66,7 @@ @properties = show @error = self.properties.error - @name = id.to_s.split(".").first.to_s + @name = id.to_s.split(".").first || unit_name end def refresh! @@ -200,12 +200,12 @@ def initialize systemd_unit super() self[:systemd_unit] = systemd_unit - status = get_status + self[:status] = get_status self[:raw] = status.stdout self[:error] = status.stderr self[:exit] = status.exit self[:enabled?] = status.exit.zero? - self[:not_found?] = status.stderr.empty? ? false : true + self[:not_found?] = service_missing? end private @@ -213,6 +213,16 @@ def get_status systemd_unit.command("is-enabled") end + + # Analyze the exit code and stdout of the command `systemctl is-enabled service_name` + def service_missing? + # the service exists and it's enabled + return false if status.exit.zero? + # the service exists and it's disabled + return false if status.exit.nonzero? && status.stdout.strip.match(/\Adisabled$/) + # for all other cases the service does not exist + true + end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.46/library/systemd/test/systemd_unit_test.rb new/yast2-3.1.50/library/systemd/test/systemd_unit_test.rb --- old/yast2-3.1.46/library/systemd/test/systemd_unit_test.rb 2014-04-15 09:28:36.000000000 +0200 +++ new/yast2-3.1.50/library/systemd/test/systemd_unit_test.rb 2014-04-17 11:18:29.000000000 +0200 @@ -25,33 +25,46 @@ end describe "#properties" do - it "returns struct with restricted installation properties" do - allow_any_instance_of(SystemdUnit).to receive(:command) - .with("is-enabled sshd.service").and_return( - OpenStruct.new('stderr'=>'', 'stdout'=>'enabled', 'exit'=>0) - ) - unit = SystemdUnit.new("sshd.service") - expect(unit.properties).to be_a(SystemdUnit::InstallationProperties) - end - - describe "#enabled?" do - it "returns true if service is enabled" do + context "Unit found" do + it "returns struct with restricted installation properties" do allow_any_instance_of(SystemdUnit).to receive(:command) .with("is-enabled sshd.service").and_return( OpenStruct.new('stderr'=>'', 'stdout'=>'enabled', 'exit'=>0) ) unit = SystemdUnit.new("sshd.service") - expect(unit.enabled?).to be_true + expect(unit.properties).to be_a(SystemdUnit::InstallationProperties) + expect(unit.properties.not_found?).to be_false + end + + describe "#enabled?" do + it "returns true if service is enabled" do + allow_any_instance_of(SystemdUnit).to receive(:command) + .with("is-enabled sshd.service").and_return( + OpenStruct.new('stderr'=>'', 'stdout'=>'enabled', 'exit'=>0) + ) + unit = SystemdUnit.new("sshd.service") + expect(unit.enabled?).to be_true + end + + it "returns false if service is disabled" do + stub_unit_command(:success=>false) + allow_any_instance_of(SystemdUnit).to receive(:command) + .with("is-enabled sshd.service").and_return( + OpenStruct.new('stderr'=>'', 'stdout'=>'disabled', 'exit'=>1) + ) + unit = SystemdUnit.new("sshd.service") + expect(unit.enabled?).to be_false + end end + end - it "returns false if service is disabled" do + context "Unit not found" do + it "returns struct with restricted installation properties" do + stub_services(:service=>'unknown') stub_unit_command(:success=>false) - allow_any_instance_of(SystemdUnit).to receive(:command) - .with("is-enabled sshd.service").and_return( - OpenStruct.new('stderr'=>'', 'stdout'=>'disabled', 'exit'=>1) - ) - unit = SystemdUnit.new("sshd.service") - expect(unit.enabled?).to be_false + unit = SystemdUnit.new("unknown.service") + expect(unit.properties).to be_a(SystemdUnit::InstallationProperties) + expect(unit.properties.not_found?).to be_true end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.46/package/yast2.changes new/yast2-3.1.50/package/yast2.changes --- old/yast2-3.1.46/package/yast2.changes 2014-04-15 09:28:36.000000000 +0200 +++ new/yast2-3.1.50/package/yast2.changes 2014-04-17 11:18:29.000000000 +0200 @@ -1,4 +1,33 @@ ------------------------------------------------------------------- +Thu Apr 17 11:11:01 CEST 2014 - locilka@suse.com + +- Decreased number of logs coming from Hooks (to enhance logs + readability) +- 3.1.50 + +------------------------------------------------------------------- +Thu Apr 17 08:22:23 UTC 2014 - vmoravec@suse.com + +- Add path to deprecation warnings (bnc#873973) +- Fix enabling LSB services during installation (bnc#873929) +- 3.1.49 + +------------------------------------------------------------------- +Wed Apr 16 13:02:54 UTC 2014 - jreidinger@suse.com + +- ensure that dialog was closed even if exception is raised + (bnc#873916) +- save_y2logs: store versions of packages in inst-sys +- 3.1.48 + +------------------------------------------------------------------- +Wed Apr 16 11:46:55 UTC 2014 - mfilka@suse.com + +- bnc#869661 + - fixed internal error raised in inst_lan during update +- 3.1.47 + +------------------------------------------------------------------- Tue Apr 15 09:09:57 CEST 2014 - locilka@suse.com - Changed Product.FindBaseProducts to throw an exception if no diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.46/package/yast2.spec new/yast2-3.1.50/package/yast2.spec --- old/yast2-3.1.46/package/yast2.spec 2014-04-15 09:28:36.000000000 +0200 +++ new/yast2-3.1.50/package/yast2.spec 2014-04-17 11:18:29.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2 -Version: 3.1.46 +Version: 3.1.50 Release: 0 URL: https://github.com/yast/yast-yast2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.46/scripts/save_y2logs new/yast2-3.1.50/scripts/save_y2logs --- old/yast2-3.1.46/scripts/save_y2logs 2014-04-15 09:28:36.000000000 +0200 +++ new/yast2-3.1.50/scripts/save_y2logs 2014-04-17 11:18:29.000000000 +0200 @@ -91,6 +91,10 @@ LIST="$LIST /var/log/pbl.log" fi +if [ -f /.packages.root ]; then + LIST="$LIST /.packages.root" +fi + RPM_LIST="rpm-qa" if [ -f /var/lib/rpm/Packages ]; then rpm -qa --qf '%{NAME}-%{VERSION}-%{RELEASE}\t\t\t(%{VENDOR})\t%{DISTRIBUTION}\n' 2>/dev/null | sort >/var/log/$RPM_LIST continue with "q"... Checked in at Thu Apr 17 14:15:15 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