commit yast2-update for openSUSE:Factory

6 May 2014

Hello community,

here is the log from the commit of package yast2-update for openSUSE:Factory checked in at 2014-05-06 13:40:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-update (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-update.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-update"

Changes:
--------

--- /work/SRC/openSUSE:Factory/yast2-update/yast2-update.changes	2014-04-05 14:42:53.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-update.new/yast2-update.changes	2014-05-06 13:40:43.000000000 +0200
@@ -1,0 +2,22 @@
+Fri May  2 12:36:53 UTC 2014 - jreidinger@suse.com
+
+- Fix internal error caused by wrong type passed as string append
+  (bnc#876136)
+- 3.1.7
+
+-------------------------------------------------------------------
+Tue Apr 22 10:52:06 CEST 2014 - locilka@suse.com
+
+- Replaced old Product.patterns with new Packages.default_patterns
+  (bnc#873923)
+- 3.1.6
+
+-------------------------------------------------------------------
+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
+
+-------------------------------------------------------------------

Old:
----
  yast2-update-3.1.4.tar.bz2

New:
----
  yast2-update-3.1.7.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.DDdVqe/_old	2014-05-06 13:40:44.000000000 +0200
+++ /var/tmp/diff_new_pack.DDdVqe/_new	2014-05-06 13:40:44.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-update
-Version:        3.1.4
+Version:        3.1.7
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -43,8 +43,9 @@
 # OSRelease
 Requires:       yast2 >= 3.1.28
 Requires:       yast2-installation
-# Function SelectKernelPackages has been moved to Packages module (bnc #326269).
-Requires:       yast2-packager >= 2.17.27
+
+# Packages.default_patterns
+Requires:       yast2-packager >= 3.1.10
 
 # moved into yast2-update from yast2-installation
 # to remove dependency on yast2-storage

++++++ yast2-update-3.1.4.tar.bz2 -> yast2-update-3.1.7.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.7/package/yast2-update.changes
--- old/yast2-update-3.1.4/package/yast2-update.changes	2014-03-28 15:53:02.000000000 +0100
+++ new/yast2-update-3.1.7/package/yast2-update.changes	2014-05-02 14:43:50.000000000 +0200
@@ -1,4 +1,26 @@
 -------------------------------------------------------------------
+Fri May  2 12:36:53 UTC 2014 - jreidinger@suse.com
+
+- Fix internal error caused by wrong type passed as string append
+  (bnc#876136)
+- 3.1.7
+
+-------------------------------------------------------------------
+Tue Apr 22 10:52:06 CEST 2014 - locilka@suse.com
+
+- Replaced old Product.patterns with new Packages.default_patterns
+  (bnc#873923)
+- 3.1.6
+
+-------------------------------------------------------------------
+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.7/package/yast2-update.spec
--- old/yast2-update-3.1.4/package/yast2-update.spec	2014-03-28 15:53:02.000000000 +0100
+++ new/yast2-update-3.1.7/package/yast2-update.spec	2014-05-02 14:43:50.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-update
-Version:        3.1.4
+Version:        3.1.7
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -45,8 +45,9 @@
 # OSRelease
 Requires:	yast2 >= 3.1.28
 Requires:	yast2-installation
-# Function SelectKernelPackages has been moved to Packages module (bnc #326269).
-Requires:	yast2-packager >= 2.17.27
+
+# Packages.default_patterns
+Requires:	yast2-packager >= 3.1.10
 
 # moved into yast2-update from yast2-installation
 # to remove dependency on yast2-storage
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.7/src/clients/inst_update.rb
--- old/yast2-update-3.1.4/src/clients/inst_update.rb	2014-03-28 15:53:02.000000000 +0100
+++ new/yast2-update-3.1.7/src/clients/inst_update.rb	2014-05-02 14:43:50.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/clients/update_proposal.rb new/yast2-update-3.1.7/src/clients/update_proposal.rb
--- old/yast2-update-3.1.4/src/clients/update_proposal.rb	2014-03-28 15:53:02.000000000 +0100
+++ new/yast2-update-3.1.7/src/clients/update_proposal.rb	2014-05-02 14:43:50.000000000 +0200
@@ -28,6 +28,8 @@
 # $Id$
 module Yast
   class UpdateProposalClient < Client
+    include Yast::Logger
+
     def main
       Yast.import "Pkg"
       Yast.import "UI"
@@ -504,14 +506,10 @@
         Builtins.foreach(restore) { |res| Pkg.ResolvableInstall(res, :product) }
         Update.SetDesktopPattern if !Update.onlyUpdateInstalled
 
-        if !Update.onlyUpdateInstalled && # just consider already installed packages
-            !ProductFeatures.GetBooleanFeature(
-              "software",
-              "only_update_installed"
-            )
-          Builtins.foreach(Product.patterns) do |pat|
-            Builtins.y2milestone("Pre-select pattern %1", pat)
-            Pkg.ResolvableInstall(pat, :pattern)
+        if !Update.OnlyUpdateInstalled
+          Packages.default_patterns.each do |pattern|
+            select_pattern_result = Pkg.ResolvableInstall(pattern, :pattern)
+            log.info "Pre-select pattern #{pattern}: #{select_pattern_result}"
           end
         end
 
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.7/src/modules/Update.rb
--- old/yast2-update-3.1.4/src/modules/Update.rb	2014-03-28 15:53:02.000000000 +0100
+++ new/yast2-update-3.1.7/src/modules/Update.rb	2014-05-02 14:43:50.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"

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)