Merge f25c54b into 1264f78

yast · Jan 13, 2022 · c734dce · c734dce
2 parents 1264f78 + f25c54b
commit c734dce
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jan 13 11:58:37 UTC 2022 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Properly merge the autoupgrade workflow when using the online
+  medium (bsc#1192437, bsc#1194440).
+- 4.3.95
+
 -------------------------------------------------------------------
 Thu Nov 25 12:56:23 UTC 2021 - Knut Anderssen <kanderssen@suse.com>
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.3.94
+Version:        4.3.95
 Release:        0
 Summary:        YaST2 - Automated Installation
 License:        GPL-2.0-only

diff --git a/src/lib/autoinstall/clients/inst_autoinit.rb b/src/lib/autoinstall/clients/inst_autoinit.rb
@@ -143,6 +143,8 @@ def run
 
         return :abort if Yast::UI.PollInput == :abort && Yast::Popup.ConfirmAbort(:painless)
 
+        Yast::WorkflowManager.SetBaseWorkflow(false)
+
         :next
       end
 
@@ -408,7 +410,6 @@ def offline_product
           Yast::Pkg.ResolvableInstall(product.details.product, :product, "")
           # initialize addons and the workflow manager
           Yast::AddOnProduct.SetBaseProductURL(base_url)
-          Yast::WorkflowManager.SetBaseWorkflow(false)
           Yast::AutoinstFunctions.reset_product
         # report error only for installation or if autoupgrade contain addon with relative url.
         # This way autoupgrade for Full medium on registered system

diff --git a/src/lib/autoinstall/clients/inst_autosetup_upgrade.rb b/src/lib/autoinstall/clients/inst_autosetup_upgrade.rb
@@ -57,12 +57,6 @@ def main
         return :abort if UI.PollInput == :abort && Popup.ConfirmAbort(:painless)
 
         Progress.NextStage
-        #
-        # Set workflow variables
-        # Ensure that we clean product cache to avoid product from control (bsc#1156058)
-        AutoinstFunctions.reset_product
-        # Merging selected product (bsc#1192437)
-        AutoinstSoftware.merge_product(AutoinstFunctions.selected_product)
 
         # configure general settings
         general_section = Profile.current["general"] || {}
@@ -172,6 +166,12 @@ def main
         Progress.NextStage
         return :abort unless suse_register
 
+        # Set workflow variables
+        # Ensure that we clean product cache to avoid product from control (bsc#1156058)
+        AutoinstFunctions.reset_product
+        # Merging selected product (bsc#1192437)
+        AutoinstSoftware.merge_product(AutoinstFunctions.selected_product)
+
         # Bootloader
         # FIXME: De-duplicate with inst_autosetup
         # Bootloader import / proposal is necessary to match changes done for manual