[yast-commit] [ci_new_pac] JFYI yast2-update -> 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-update -> sle12 ## BNC# 873122 : "Update: popup warning if default is changed" (RESOLVED/FIXED) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-update/yast2-update.changes 2014-03-31 10:49:42.000000000 +0200 +++ /mounts/work_src_done/SLE12/yast2-update/yast2-update.changes 2014-04-15 16:21:54.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Apr 15 15:57:20 CEST 2014 - locilka@suse.com + +- Warning user that changing update mode from "patterns" to + "update only installed rpms" might lead into broken system. + Only if "patterns" were the default selection (bnc#873122). +- 3.1.5 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-product-creator - yast2-schema - yast2-update ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-update (Old) and /mounts/work_src_done/SLE12/yast2-update (BS:build ID:36364 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-update", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-update-3.1.4.tar.bz2 New: ---- yast2-update-3.1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-update.spec ++++++ --- /var/tmp/diff_new_pack.5Ozg4J/_old 2014-04-15 18:42:07.000000000 +0200 +++ /var/tmp/diff_new_pack.5Ozg4J/_new 2014-04-15 18:42:07.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 3.1.4 +Version: 3.1.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-update-3.1.4.tar.bz2 -> yast2-update-3.1.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.4/package/yast2-update.changes new/yast2-update-3.1.5/package/yast2-update.changes --- old/yast2-update-3.1.4/package/yast2-update.changes 2014-03-28 18:24:15.000000000 +0100 +++ new/yast2-update-3.1.5/package/yast2-update.changes 2014-04-15 16:18:32.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Apr 15 15:57:20 CEST 2014 - locilka@suse.com + +- Warning user that changing update mode from "patterns" to + "update only installed rpms" might lead into broken system. + Only if "patterns" were the default selection (bnc#873122). +- 3.1.5 + +------------------------------------------------------------------- Fri Mar 28 15:02:22 CET 2014 - locilka@suse.com - Fixed loading kernel modules while probing disks (bnc#869091) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.4/package/yast2-update.spec new/yast2-update-3.1.5/package/yast2-update.spec --- old/yast2-update-3.1.4/package/yast2-update.spec 2014-03-28 18:24:15.000000000 +0100 +++ new/yast2-update-3.1.5/package/yast2-update.spec 2014-04-15 16:18:32.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-update -Version: 3.1.4 +Version: 3.1.5 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.4/src/clients/inst_update.rb new/yast2-update-3.1.5/src/clients/inst_update.rb --- old/yast2-update-3.1.4/src/clients/inst_update.rb 2014-03-28 18:24:15.000000000 +0100 +++ new/yast2-update-3.1.5/src/clients/inst_update.rb 2014-04-15 16:18:32.000000000 +0200 @@ -218,19 +218,29 @@ end if (@ret == :next || @ret == :ok) && Pkg.RestoreState(true) - @something_changed = false - - if UI.QueryWidget(Id(:notupgrade), :Value) != - Update.onlyUpdateInstalled - @something_changed = true - end - - if @something_changed && Packages.base_selection_modified - # yes/no question - if !Popup.YesNo( - _("Do you really want\nto reset your detailed selection?") + new_onlyUpdateInstalled = UI.QueryWidget(Id(:notupgrade), :Value) + # Selection has changed + if Update.onlyUpdateInstalled != new_onlyUpdateInstalled + # BNC#873122 + # The default is 'do not onlyUpdateInstalled' + # New status is 'do onlyUpdateInstalled' + if !Update.default_onlyUpdateInstalled && new_onlyUpdateInstalled + next unless Popup::AnyQuestion( + Label.WarningMsg, + # warning / question + _( + "Changing the update method to 'Update packages only' might\n" + + "lead into non-bootable or non-working system if you do not\n" + + "adjust the list of packages yourself.\n\n" + + "Really continue?" + ), + Label.YesButton, + Label.NoButton, + :focus_no ) - next + elsif Packages.base_selection_modified + # yes/no question + next unless Popup.YesNo(_("Do you really want\nto reset your detailed selection?")) end end end @@ -242,10 +252,7 @@ Update.did_init1 = false @b1 = Update.onlyUpdateInstalled - Update.onlyUpdateInstalled = Convert.to_boolean( - UI.QueryWidget(Id(:notupgrade), :Value) - ) - # Update::deleteOldPackages = (boolean) UI::QueryWidget (`id(`delete), `Value); + Update.onlyUpdateInstalled = UI.QueryWidget(Id(:notupgrade), :Value) if @b1 != Update.onlyUpdateInstalled || @details_pressed Update.manual_interaction = true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-update-3.1.4/src/modules/Update.rb new/yast2-update-3.1.5/src/modules/Update.rb --- old/yast2-update-3.1.4/src/modules/Update.rb 2014-03-28 18:24:15.000000000 +0100 +++ new/yast2-update-3.1.5/src/modules/Update.rb 2014-04-15 16:18:32.000000000 +0200 @@ -420,6 +420,7 @@ # y2milestone ("deleteOldPackages %1", deleteOldPackages); @onlyUpdateInstalled = OnlyUpdateInstalled() + @default_onlyUpdateInstalled = deep_copy(@onlyUpdateInstalled) Builtins.y2milestone("onlyUpdateInstalled %1", @onlyUpdateInstalled) @disallow_upgrade = false @@ -857,6 +858,7 @@ publish :variable => :did_init2, :type => "boolean" publish :variable => :last_runlevel, :type => "integer" publish :variable => :onlyUpdateInstalled, :type => "boolean" + publish :variable => :default_onlyUpdateInstalled, :type => "boolean" publish :variable => :selected_selection, :type => "string" publish :variable => :products_incompatible, :type => "boolean" publish :variable => :updateBasePackages, :type => "boolean" continue with "q"... Checked in at Tue Apr 15 18:42:36 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