Attachment 874414 Details for Bug 1223107

[patch] diff of the yast-registration source code between the SLE-15-SP5 branch and the SLE-15-SP6 branch

yast-registration-sp5-sp6.diff (text/plain), 2.12 KB, created by Stefan Hundhammer on 2024-04-22 11:21:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Hundhammer

Created: 2024-04-22 11:21:41 UTC

Size: 2.12 KB

patch

obsolete

>diff --git a/src/lib/registration/ui/migration_repos_workflow.rb b/src/lib/registration/ui/migration_repos_workflow.rb
>index 2b83d5df..4b0de3f3 100644
>--- a/src/lib/registration/ui/migration_repos_workflow.rb
>+++ b/src/lib/registration/ui/migration_repos_workflow.rb
>@@ -689,17 +689,8 @@ module Registration
>                                           .select { |p| p.is_a?(Y2Packager::RepoProductSpec) }
>         log.info("Found base products on the offline medium: #{products.pretty_inspect}")
> 
>-        new_migration = products.any? do |p|
>-          next false unless p.name == "SLES" || p.name == "SLE_HPC"
>-
>-          version = p.version.split(".")
>-          major = version[0].to_i
>-          minor = version[1].to_i
>-
>-          # SLE15-SP6 or newer
>-          major > 15 || (major == 15 && minor >= 6)
>-        end
>-
>+        # in SP6+ always use the new product mapping
>+        new_migration = true
>         log.info "Using SP6+ product upgrade mapping: #{new_migration}"
>         Y2Packager::ProductUpgrade.new_renames = new_migration
>         Yast::AddOnProduct.new_renames = new_migration
>diff --git a/src/lib/registration/ui/migration_selection_dialog.rb b/src/lib/registration/ui/migration_selection_dialog.rb
>index 468249cc..62a9fc11 100644
>--- a/src/lib/registration/ui/migration_selection_dialog.rb
>+++ b/src/lib/registration/ui/migration_selection_dialog.rb
>@@ -219,17 +219,8 @@ module Registration
> 
>       # helper method to update the product mapping in Y2Packager::ProductUpgrade
>       def update_product_mapping
>-        new_migration = current_migration.any? do |p|
>-          next false unless p.identifier == "SLES" || p.identifier == "SLE_HPC"
>-
>-          version = p.version.split(".")
>-          major = version[0].to_i
>-          minor = version[1].to_i
>-
>-          # SLE15-SP6 or newer
>-          major > 15 || (major == 15 && minor >= 6)
>-        end
>-
>+        # in SP6+ always use the new product mapping
>+        new_migration = true
>         log.info "Using SP6+ product upgrade mapping: #{new_migration}"
>         Y2Packager::ProductUpgrade.new_renames = new_migration
>         Yast::AddOnProduct.new_renames = new_migration

Actions: View | Diff

Attachments on bug 1223107: 874366 | 874367 | 874411 | 874412 | 874414