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# 867125 : "Systemd target proposal dialog ignores user preference" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-services-manager/yast2-services-manager.changes 2014-03-03 13:00:26.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-services-manager/yast2-services-manager.changes 2014-03-10 14:46:45.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 7 14:15:16 UTC 2014 - vmoravec@suse.com + +- Respect the user preference for default target (bnc#867125) +- 3.1.9 + +------------------------------------------------------------------- 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:34126 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-services-manager", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-services-manager-3.1.8.tar.bz2 New: ---- yast2-services-manager-3.1.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-services-manager.spec ++++++ --- /var/tmp/diff_new_pack.POSPxt/_old 2014-03-10 16:14:12.000000000 +0100 +++ /var/tmp/diff_new_pack.POSPxt/_new 2014-03-10 16:14:13.000000000 +0100 @@ -24,7 +24,7 @@ ###################################################################### Name: yast2-services-manager -Version: 3.1.8 +Version: 3.1.9 Release: 0 BuildArch: noarch ++++++ yast2-services-manager-3.1.8.tar.bz2 -> yast2-services-manager-3.1.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.8/package/yast2-services-manager.changes new/yast2-services-manager-3.1.9/package/yast2-services-manager.changes --- old/yast2-services-manager-3.1.8/package/yast2-services-manager.changes 2014-02-28 18:40:17.000000000 +0100 +++ new/yast2-services-manager-3.1.9/package/yast2-services-manager.changes 2014-03-10 14:44:38.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Mar 7 14:15:16 UTC 2014 - vmoravec@suse.com + +- Respect the user preference for default target (bnc#867125) +- 3.1.9 + +------------------------------------------------------------------- Fri Feb 28 17:06:39 UTC 2014 - vmoravec@suse.com - Reload target detection after install config change (bnc#866292) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.8/package/yast2-services-manager.spec new/yast2-services-manager-3.1.9/package/yast2-services-manager.spec --- old/yast2-services-manager-3.1.8/package/yast2-services-manager.spec 2014-02-28 18:40:17.000000000 +0100 +++ new/yast2-services-manager-3.1.9/package/yast2-services-manager.spec 2014-03-10 14:44:38.000000000 +0100 @@ -24,7 +24,7 @@ ###################################################################### Name: yast2-services-manager -Version: 3.1.8 +Version: 3.1.9 Release: 0 BuildArch: noarch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.8/src/clients/default_target_proposal.rb new/yast2-services-manager-3.1.9/src/clients/default_target_proposal.rb --- old/yast2-services-manager-3.1.8/src/clients/default_target_proposal.rb 2014-02-28 18:40:17.000000000 +0100 +++ new/yast2-services-manager-3.1.9/src/clients/default_target_proposal.rb 2014-03-10 14:44:38.000000000 +0100 @@ -22,7 +22,6 @@ attr_reader :warnings def detect_warnings selected_target - @warnings = [] if Linuxrc.vnc && selected_target != Target::GRAPHICAL warnings << _('VNC needs graphical system to be available') end @@ -67,6 +66,7 @@ def initialize textdomain 'services-manager' + @warnings = [] @available_targets = Target::SUPPORTED end @@ -81,14 +81,14 @@ def handle_dialog case UI.UserInput when :next, :ok - selected_target = UI.QueryWidget(Id(:selected_target), :CurrentButton).to_s - Builtins.y2milestone "Target selected by user: #{selected_target}" + selected_target = UI.QueryWidget(Id(:selected_target), :CurrentButton) detect_warnings(selected_target) if !warnings.empty? return handle_dialog unless Popup.ContinueCancel(warnings.join "\n") end - Builtins.y2milestone "Setting systemd default target to '#{selected_target}'" - SystemdTarget.default_target = selected_target unless selected_target.empty? + Builtins.y2milestone "User selected target '#{selected_target}'" + SystemdTarget.default_target = selected_target + SystemdTarget.force = true :next when :cancel :cancel @@ -166,8 +166,15 @@ def initialize textdomain 'services-manager' + @warnings = [] + if SystemdTarget.force + Builtins.y2milestone( + "Default target has been changed before by user manually to '#{SystemdTarget.default_target}'" + ) + end change_default_target detect_warnings(default_target) + Builtins.y2milestone("Systemd default target is set to '#{SystemdTarget.default_target}'") end def create @@ -183,26 +190,58 @@ def change_default_target self.default_target = ProductFeatures.GetFeature('globals', 'default_target') detect_target - SystemdTarget.default_target = self.default_target + # Check if the user forced a particular target before; if he did and the + # autodetection recommends a different one now, warn the user about this + # and keep the default target unchanged. + if SystemdTarget.force && default_target != SystemdTarget.default_target + warnings << _("The installer is recommending you the default target '%s' ") % default_target + warnings << SystemdTarget.proposal_reason + self.default_target = SystemdTarget.default_target + return + end + Builtins.y2milestone("Setting systemd default target to #{default_target}") + SystemdTarget.default_target = default_target end def detect_target - if Arch.x11_setup_needed && Pkg.IsSelected("xorg-x11-server") || Mode.live_installation - self.default_target = Target::GRAPHICAL - return - end + self.default_target = + if Arch.x11_setup_needed && Pkg.IsSelected("xorg-x11-server") + give_reason _("X11 packages have been selected for installation") + Target::GRAPHICAL + elsif Mode.live_installation + give_reason _("Live Installation is typically used for full GUI in target system") + Target::GRAPHICAL + elsif Linuxrc.serial_console + give_reason _("Serial connection does typically not support GUI") + Target::MULTIUSER + elsif Linuxrc.vnc && Linuxrc.usessh + if UI.GetDisplayInfo == 'TextMode' + give_reason _("Text mode installation assumes no GUI on the target system") + Target::MULTIUSER + else + give_reason _("Using VNC assumes a GUI on the target system") + Target::GRAPHICAL + end + elsif Linuxrc.vnc + give_reason _("Using VNC assumes a GUI on the target system") + Target::GRAPHICAL + elsif Linuxrc.usessh + give_reason _("SSH installation mode assumes no GUI on the target system") + Target::MULTIUSER + elsif !(Arch.x11_setup_needed && Pkg.IsSelected("xorg-x11-server")) + give_reason _("X11 packages have not been selected for installation") + Target::MULTIUSER + else + give_reason _("This recommendation is based on the analysis of other installation settings") + Target::MULTIUSER + end - if Linuxrc.serial_console - self.default_target = Target::MULTIUSER - elsif Linuxrc.vnc && Linuxrc.usessh - self.default_target = UI.GetDisplayInfo == 'TextMode' ? Target::MULTIUSER : Target::GRAPHICAL - elsif Linuxrc.vnc - self.default_target = Target::GRAPHICAL - elsif Linuxrc.usessh - self.default_target = Target::MULTIUSER - else - self.default_target = Target::MULTIUSER - end + Builtins.y2milestone("Detected target proposal '#{default_target}'") + end + + def give_reason message + SystemdTarget.proposal_reason = message + Builtins.y2milestone("Systemd target detection says: #{message}") end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-services-manager-3.1.8/src/modules/systemd_target.rb new/yast2-services-manager-3.1.9/src/modules/systemd_target.rb --- old/yast2-services-manager-3.1.8/src/modules/systemd_target.rb 2014-02-28 18:40:17.000000000 +0100 +++ new/yast2-services-manager-3.1.9/src/modules/systemd_target.rb 2014-03-10 14:44:38.000000000 +0100 @@ -26,7 +26,7 @@ MULTIUSER = 'multi-user' end - attr_accessor :modified, :targets + attr_accessor :modified, :targets, :force, :proposal_reason attr_reader :errors, :default_target alias_method :all, :targets continue with "q"... Checked in at Mon Mar 10 16:14:27 CET 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