Merge pull request #291 from yast/review_170308_bnc_1014861

[Review] Request from 'schubi2' @ 'yast/yast-autoinstallation/review_170308_bnc_1014861'
yast · Mar 8, 2017 · 7c4924d · 7c4924d
2 parents 06d4bc0 + 0eea8f5
commit 7c4924d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar  7 09:39:12 CET 2017 - schubi@suse.de
+
+- Update: Product selection will be done by Packages.SelectProduct
+  now (bnc#1014861).
+- 3.2.10
+
 -------------------------------------------------------------------
 Wed Feb 15 16:27:53 CET 2017 - schubi@suse.de
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           autoyast2
-Version:        3.2.9
+Version:        3.2.10
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/clients/inst_autosetup_upgrade.rb b/src/clients/inst_autosetup_upgrade.rb
@@ -299,20 +299,13 @@ def main
       if !Update.did_init1
         Update.did_init1 = true
 
-        @restore = []
-        @selected = Pkg.ResolvableProperties("", :product, "")
-        Builtins.foreach(@selected) do |s|
-          @restore = Builtins.add(@restore, Ops.get_string(s, "name", ""))
-        end
-
         Pkg.PkgApplReset
 
         # bnc #300540
         # bnc #391785
         # Drops packages after PkgApplReset, not before (that would null that)
         Update.DropObsoletePackages
 
-        Builtins.foreach(@restore) { |res| Pkg.ResolvableInstall(res, :product) }
         Update.SetDesktopPattern if !Update.onlyUpdateInstalled
 
         # make sure the packages needed for accessing the installation repository