Select the default product patterns (FATE#320199)

in the pattern based upgrade - 3.1.38
yast · Apr 22, 2016 · 55bad33 · 55bad33
1 parent 5d7b7d6
commit 55bad33
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/package/yast2-update.changes b/package/yast2-update.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr 22 16:37:31 UTC 2016 - lslezak@suse.cz
+
+- Select the default product patterns in the pattern based upgrade
+  (FATE#320199)
+- 3.1.38
+
 -------------------------------------------------------------------
 Mon Mar 14 10:27:34 UTC 2016 - igonzalezsosa@suse.com
 

diff --git a/package/yast2-update.spec b/package/yast2-update.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-update
-Version:        3.1.37
+Version:        3.1.38
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/clients/update_proposal.rb b/src/clients/update_proposal.rb
@@ -502,14 +502,22 @@ def init_stuff
           Pkg::ResolvableInstall(package, :package)
         end
 
+        Packages.SelectProduct
+
+        # upgrade based on patterns
         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
 
-        Packages.SelectProduct
+          # preselect the default product patterns (FATE#320199)
+          # note: must be called *after* selecting the products
+          require "packager/product_patterns"
+          product_patterns = ProductPatterns.new
+          log.info "Selecting the default product patterns: #{product_patterns.names}"
+          product_patterns.select
+        end
 
         # FATE #301990, Bugzilla #238488
         # Control the upgrade process better