Merge pull request #382 from yast/review_180110_merge_product

[Review] Request from 'schubi2' @ 'yast/yast-autoinstallation/review_180110_merge_product'
yast · Jan 11, 2018 · 11ade63 · 11ade63
2 parents 9cb627d + bcab600
commit 11ade63
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 15 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 10 17:20:25 UTC 2018 - schubi@suse.de
+
+- Merging products before package evaluation starts.
+  (bnc#1075182)
+- 4.0.19
+
 -------------------------------------------------------------------
 Wed Jan 10 14:23:07 UTC 2018 - igonzalezsosa@suse.com
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.0.18
+Version:        4.0.19
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/clients/inst_autosetup.rb b/src/clients/inst_autosetup.rb
@@ -354,6 +354,9 @@ def main
 
       Progress.NextStage
 
+      # Merging selected product
+      AutoinstSoftware.merge_product(AutoinstConfig.selected_product)
+
       # Evaluating package and patterns selection.
       # Selection will stored in PackageAI.
       AutoinstSoftware.Import(Ops.get_map(Profile.current, "software", {}))

diff --git a/src/modules/AutoinstSoftware.rb b/src/modules/AutoinstSoftware.rb
@@ -850,8 +850,6 @@ def Write
       Pkg.SetSolverFlags({ "ignoreAlreadyRecommended" => Mode.normal, 
                            "onlyRequires" => !sw_settings.fetch("install_recommended",true) })
 
-      merge_product(AutoinstFunctions.selected_product)
-
       failed = []
 
       # Add storage-related software packages (filesystem tools etc.) to the
@@ -1121,6 +1119,22 @@ def SavedPackageSelection
       @saved_package_selection
     end
 
+    # Selects given product (see Y2Packager::Product) and merges its workflow
+    def merge_product(product)
+      raise ArgumentError, "Base product expected" if !product
+
+      log.info("AutoinstSoftware::merge_product - using product: #{product.name}")
+      product.select
+
+      WorkflowManager.merge_product_workflow(product)
+
+      # Adding needed autoyast packages if a second stage is needed.
+      # Could have been changed due merging a products
+      log.info("Checking new second stage requirement.")
+      Profile.softwareCompat
+    end
+
+    publish :function => :merge_product, :type => "void (string)"
     publish :variable => :Software, :type => "map"
     publish :variable => :image, :type => "map <string, any>"
     publish :variable => :image_arch, :type => "string"
@@ -1151,18 +1165,6 @@ def SavedPackageSelection
     publish :function => :addPostPackages, :type => "void (list <string>)"
     publish :function => :ReadHelper, :type => "map <string, any> ()"
     publish :function => :Read, :type => "boolean ()"
-
-  private
-
-    # Selects given product (see Y2Packager::Product) and merges its workflow
-    def merge_product(product)
-      raise ArgumentError, "Base product expected" if !product
-
-      log.info("AutoinstSoftware::merge_product - using product: #{product.name}")
-      product.select
-
-      WorkflowManager.merge_product_workflow(product)
-    end
   end
 
   AutoinstSoftware = AutoinstSoftwareClass.new