Merge pull request #1107 from yast/restore_selection_master

yast · Feb 6, 2024 · 630d3f6 · 630d3f6
2 parents 8f7d3f0 + fe6c10a
commit 630d3f6
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Feb  6 16:05:37 UTC 2024 - Ladislav Slezák <lslezak@suse.com>
+
+- Restore the selected products after reloading the package
+  manager, properly install all products for new modules and
+  extensions when upgrading from SLE12 (bsc#1218391)
+- 5.0.6
+
 -------------------------------------------------------------------
 Fri Jan 26 12:26:06 UTC 2024 - Knut Anderssen <kanderssen@suse.com>
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        5.0.5
+Version:        5.0.6
 Release:        0
 Summary:        YaST2 - Installation Parts
 License:        GPL-2.0-only

diff --git a/src/lib/installation/upgrade_repo_manager.rb b/src/lib/installation/upgrade_repo_manager.rb
@@ -126,11 +126,17 @@ def activate_changes
       process_repos
       remove_services
 
-      # reload the package manager to activate the changes
+      # reload the package manager to activate the changes,
+      # remember the selected products/packages (ignore the dependencies selected by solver)
+      selected = Y2Packager::Resolvable.find(status: :selected, transact_by: :appl_high)
+
       Yast::Pkg.SourceSaveAll
       Yast::Pkg.SourceFinishAll
       Yast::Pkg.SourceRestore
       Yast::Pkg.SourceLoad
+
+      # restore the selection
+      selected.each { |s| Yast::Pkg.ResolvableInstall(s.name, s.kind) }
     end
 
   private

diff --git a/test/lib/upgrade_repo_manager_test.rb b/test/lib/upgrade_repo_manager_test.rb
@@ -101,6 +101,7 @@ def self.is_registered?
       allow(Yast::Pkg).to receive(:SourceFinishAll)
       allow(Yast::Pkg).to receive(:SourceRestore)
       allow(Yast::Pkg).to receive(:SourceLoad)
+      allow(Y2Packager::Resolvable).to receive(:find).and_return([])
     end
 
     it "removes the selected repositories" do
@@ -133,6 +134,15 @@ def self.is_registered?
       expect(Yast::Pkg).to receive(:ServiceDelete).with(service1.alias)
       subject.activate_changes
     end
+
+    it "restores the selected products" do
+      product = double(name: "SLES", kind: :product)
+      expect(Y2Packager::Resolvable).to receive(:find)
+        .with(status: :selected, transact_by: :appl_high).and_return([product])
+      expect(Yast::Pkg).to receive(:ResolvableInstall)
+        .with(product.name, product.kind).and_return(true)
+      subject.activate_changes
+    end
   end
 
   describe ".create_from_old_repositories" do