Merge remote-tracking branch 'upstream/SLE-15-SP4' into huha-install-…

…inf-master

package/yast2-packager.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Apr 27 13:31:36 UTC 2022 - Stefan Hundhammer <shundhammer@suse.com>
+
+- Don't rely on install.inf availability #(bsc#1198560)
+- 4.5.2
+
+-------------------------------------------------------------------
+Wed Apr 27 11:24:44 UTC 2022 - Ladislav Slezák <lslezak@suse.cz>
+
+- Fixed migration summary in Leap -> SLES migration (bsc#1198562)
+
 -------------------------------------------------------------------
 Thu Apr  7 11:28:48 UTC 2022 - Stefan Hundhammer <shundhammer@suse.com>
 

package/yast2-packager.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        4.5.1
+Version:        4.5.2
 Release:        0
 Summary:        YaST2 - Package Library
 License:        GPL-2.0-or-later

src/lib/y2packager/product_spec_reader.rb

@@ -27,6 +27,7 @@ module Y2Packager
   class ProductSpecReader
     include Yast::Logger
     Yast.import "Mode"
+    Yast.import "Linuxrc"
 
     # Returns the list of product specifications.
     #
@@ -35,7 +36,7 @@ def products
       # products_from_control || products_from_offline || products_from_libzypp
 
       # online migration (in installed system)
-      return products_from_libzypp if Yast::Mode.normal
+      return products_from_libzypp if Yast::Mode.normal || !install_inf?
 
       if InstallationMedium.contain_multi_repos?
         products_from_multi_repos
@@ -70,5 +71,12 @@ def products_from_libzypp
       log.info "Products from libzypp: #{libzypp_products.map(&:name).join(", ")}"
       libzypp_products
     end
+
+    # Is information from an install.inf file available?
+    #
+    # @return [Boolean]
+    def install_inf?
+      !Yast::Linuxrc.keys.empty?
+    end
   end
 end

src/modules/AddOnProduct.rb

@@ -41,8 +41,14 @@ class AddOnProductClass < Module
       "sle-sdk"                           => ["sle-module-development-tools"],
       # openSUSE => SLES migration
       "openSUSE"                          => ["SLES"],
+      # openSUSE 15.3+ => SLES migration
+      "Leap"                              => ["SLES"],
       # the IBM tools have been renamed in SLE12->SLE15 upgrade
       "ibm-dlpar-utils"                   => ["ibm-power-tools"]
+
+      # NOTE: if you change anything here then check
+      # https://github.com/yast/yast-packager/blob/master/src/lib/y2packager/product_upgrade.rb#L27
+      # maybe it needs an update as well...
     }.freeze
 
     # @return [Hash] Product renames added externally through the #add_rename method

test/lib/product_spec_reader_test.rb

@@ -38,6 +38,9 @@
   let(:full_products) { [instance_double(Y2Packager::ProductSpec, name: "SLES")] }
   let(:control_products) { [instance_double(Y2Packager::ProductSpec, name: "SLED")] }
   let(:libzypp_products) { [instance_double(Y2Packager::ProductSpec, name: "SLE-HA")] }
+  let(:linuxrc_fake) { { foo: "bar" } }
+  let(:linuxrc_empty) { {} }
+  let(:linuxrc_keys) { linuxrc_fake }
 
   describe "#products" do
     before do
@@ -47,6 +50,7 @@
       allow(Y2Packager::InstallationMedium).to receive(:contain_repo?).and_return(false)
       allow(Y2Packager::InstallationMedium).to receive(:contain_multi_repos?).and_return(false)
       allow(Yast::Mode).to receive(:normal).and_return(false)
+      allow(Yast::Linuxrc).to receive(:keys).and_return(linuxrc_keys)
     end
 
     context "when medium does not contain any repository" do
@@ -85,5 +89,16 @@
         expect(reader.products).to eq(libzypp_products)
       end
     end
+
+    context "without /etc/install.inf" do
+      let(:linuxrc_keys) { linuxrc_empty }
+      before do
+        allow(Yast::Mode).to receive(:normal).and_return(false)
+      end
+
+      it "returns the libzypp products" do
+        expect(reader.products).to eq(libzypp_products)
+      end
+    end
   end
 end