Merge remote-tracking branch 'origin/SLE-15-SP6' into sync_master

package/yast2-packager.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Mar 12 13:43:26 UTC 2024 - Ladislav Slezák <lslezak@suse.com>
+
+- Change the product mapping API to be the same as in SP5 and older
+  (related to bsc#1220567)
+- 5.0.5
+
+-------------------------------------------------------------------
+Thu Feb 22 09:34:54 UTC 2024 - Ladislav Slezák <lslezak@suse.com>
+
+- Display a better product summary for the SLE_HPC => SLES upgrade
+  (jsc#PED-7841)
+
 -------------------------------------------------------------------
 Tue Feb 13 16:40:17 UTC 2024 - Ladislav Slezák <lslezak@suse.com>
 

package/yast2-packager.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        5.0.4
+Version:        5.0.5
 Release:        0
 Summary:        YaST2 - Package Library
 License:        GPL-2.0-or-later
@@ -77,6 +77,8 @@ Requires:       ruby-solv
 Conflicts:      yast2-core < 2.15.10
 # NotEnoughMemory-related functions moved to misc.ycp import-file
 Conflicts:      yast2-add-on < 2.15.15
+# changed API in Y2Packager::ProductUpgrade and Yast::AddOnProduct
+Conflicts:      yast2-registration < 5.0.1
 
 # ensure that 'checkmedia' is on the medium
 Recommends:     checkmedia

src/lib/y2packager/product_upgrade.rb

@@ -50,6 +50,8 @@ class ProductUpgrade
       # in the src/modules/AddOnProduct.rb file, maybe it needs an update as well...
     }.freeze
 
+    private_constant :MAPPING
+
     # This maps uses a list of installed products as the key and the removed products as a value.
     # All products in key have to be installed.
     # It is used in special cases when the removed product is still available on the medium
@@ -63,7 +65,18 @@ class ProductUpgrade
     }.freeze
     # rubocop:enable Layout/LineLength
 
+    private_constant :UPGRADE_REMOVAL_MAPPING
+
     class << self
+      # flag for using old or new product mapping, not used in SLE15-SP6+
+      attr_accessor :new_renames
+
+      def mapping
+        # no special handling, the mapping is static in SLE15-SP6+,
+        # in SLE15-SP5 it is dynamic depending on the installed version
+        MAPPING.dup
+      end
+
       # Find a new available base product which upgrades the installed base product.
       #
       # The workflow to find the new base product is:
@@ -115,18 +128,20 @@ def will_be_obsoleted_by(old_product_name)
         installed = Y2Packager::Product.installed_products.map(&:name)
         selected_products = Y2Packager::Product.with_status(:selected).map(&:name)
 
+        product_mapping = mapping
+
         # the "sort_by(&:size).reverse" part ensures we try first the longer
         # mappings (more installed products) to find more specific matches
-        old_products = MAPPING.keys.sort_by(&:size).reverse.find do |products|
+        old_products = product_mapping.keys.sort_by(&:size).reverse.find do |products|
           # the product is included in the mapping key and all product mapping key
           # products are installed and the replacement products are selected
           products.include?(old_product_name) && (products - installed).empty? &&
-            selected_products.include?(MAPPING[products])
+            selected_products.include?(product_mapping[products])
         end
 
         return [] unless old_products
 
-        [MAPPING[old_products]]
+        [product_mapping[old_products]]
       end
 
       # Returns the products which are upgraded by the solver but should be actually
@@ -175,18 +190,20 @@ def find_by_count(available)
       def find_by_mapping(available)
         installed = Y2Packager::Product.installed_products
 
+        product_mapping = mapping
+
         # sort the keys by length, try more products first
         # to find the most specific upgrade, prefer the
         # SLES + sle-module-hpc => SLE_HPC upgrade to plain SLES => SLES upgrade
         # (if that would be in the list)
-        upgrade = MAPPING.keys.sort_by(&:size).reverse.find do |keys|
+        upgrade = product_mapping.keys.sort_by(&:size).reverse.find do |keys|
           keys.all? { |name| installed.any? { |p| p.name == name } }
         end
 
         log.info("Fallback upgrade for products: #{upgrade.inspect}")
         return nil unless upgrade
 
-        name = MAPPING[upgrade]
+        name = product_mapping[upgrade]
         product = available.find { |p| p.name == name }
         log.info("New product: #{product}")
         product

src/modules/AddOnProduct.rb

@@ -28,9 +28,9 @@ class AddOnProductClass < Module
       # SLE12 HA GEO is now included in SLE15 HA
       "sle-ha-geo"                        => ["sle-ha"],
       "SUSE_SLES_SAP"                     => ["SLES_SAP"],
-      # SLE HPC is not a base product anymore, it is SLES + HPC module now
-      "SLE-HPC"                           => ["SLES", "sle-module-hpc"],
-      "SLE_HPC"                           => ["SLES", "sle-module-hpc"],
+      # SLE HPC is not a base product anymore, it is SLES (+ HPC module) now
+      "SLE-HPC"                           => ["SLES"],
+      "SLE_HPC"                           => ["SLES"],
       # SMT is now integrated into the base SLES
       "sle-smt"                           => ["SLES"],
       # Live patching is a module now (bsc#1074154)
@@ -51,6 +51,17 @@ class AddOnProductClass < Module
       # in the src/lib/y2packager/product_upgrade.rb file, maybe it needs an update as well...
     }.freeze
 
+    private_constant :DEFAULT_PRODUCT_RENAMES
+
+    # flag for using old or new product mapping, not used in SLE15-SP6+
+    attr_accessor :new_renames
+
+    def default_product_renames
+      # no special handling, the product renames is a static map in SLE15-SP6+,
+      # in SLE15-SP5 it is dynamic depending on the installed version
+      DEFAULT_PRODUCT_RENAMES
+    end
+
     # @return [Hash] Product renames added externally through the #add_rename method
     attr_accessor :external_product_renames
     private :external_product_renames, :external_product_renames=
@@ -2014,7 +2025,7 @@ def missing_upgrades
 
       # handle the product renames, if a renamed product was installed
       # replace it with the new product so the new product is preselected
-      DEFAULT_PRODUCT_RENAMES.each do |k, v|
+      default_product_renames.each do |k, v|
         next unless installed_addons.include?(k)
 
         installed_addons.delete(k)
@@ -2105,12 +2116,12 @@ def renamed_by_libzypp?(old_name, new_name)
 
     # Determine whether a product rename is included in the fallback map
     #
-    # @see DEFAULT_PRODUCT_RENAMES
+    # @see default_product_renames
     # @see #renamed_at?
     def renamed_by_default?(old_name, new_name)
       log.info "Search #{old_name} -> #{new_name} rename in default map: " \
-               "#{DEFAULT_PRODUCT_RENAMES.inspect}"
-      renamed_at?(DEFAULT_PRODUCT_RENAMES, old_name, new_name)
+               "#{default_product_renames.inspect}"
+      renamed_at?(default_product_renames, old_name, new_name)
     end
 
     # Determine whether a product rename is present on a given hash