Drop the previously used repositories when going back (bsc#1215884)

- 4.5.4
yast · Oct 27, 2023 · 27f370c · 27f370c
1 parent d23d9c8
commit 27f370c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/package/yast2-update.changes b/package/yast2-update.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Oct 27 13:58:30 UTC 2023 - Ladislav Slezák <lslezak@suse.com>
+
+- Drop the previously used repositories when going back to the
+  partition selection at upgrade, this ensures the repositories
+  are correctly reinitialized later (bsc#1215884)
+- 4.5.4
+
 -------------------------------------------------------------------
 Wed Apr 12 08:37:15 UTC 2023 - Ladislav Slezák <lslezak@suse.com>
 

diff --git a/package/yast2-update.spec b/package/yast2-update.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-update
-Version:        4.5.3
+Version:        4.5.4
 Release:        0
 Summary:        YaST2 - Update
 Group:          System/YaST

diff --git a/src/include/update/rootpart.rb b/src/include/update/rootpart.rb
@@ -28,6 +28,7 @@
 #    calling this module.
 require "yast"
 
+require "y2packager/medium_type"
 require "y2packager/original_repository_setup"
 require "y2packager/product_spec"
 require "y2packager/repository"
@@ -455,6 +456,10 @@ def RootPartitionDialog(flavor)
 
       # New partition has been mounted
       if flavor == :update_dialog && ret == :next
+        # drop all loaded repositories after going back in SLE, the installation medium is added later
+        # FIXME: what to do in Leap? we need to keep the already added installation repository... :-/
+        Pkg.SourceFinishAll if !Y2Packager::MediumType.standard?
+
         # override the current target distribution at the system and use
         # the target distribution from the base product to make the new service
         # repositories compatible with the base product at upgrade (bnc#881320)