diff --git a/.rubocop.yml b/.rubocop.yml index 1db2d81..9a8d275 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -18,7 +18,7 @@ Lint/UnderscorePrefixedVariableName: # Offense count: 25 Metrics/AbcSize: - Max: 188 + Max: 190 # Offense count: 23 # Configuration parameters: CountComments, ExcludedMethods. @@ -40,7 +40,7 @@ Metrics/ClassLength: # Offense count: 25 Metrics/CyclomaticComplexity: - Max: 46 + Max: 50 # Offense count: 27 # Configuration parameters: CountComments, ExcludedMethods. @@ -54,7 +54,7 @@ Metrics/ModuleLength: # Offense count: 24 Metrics/PerceivedComplexity: - Max: 55 + Max: 60 # Offense count: 49 # Configuration parameters: EnforcedStyle. diff --git a/package/yast2-update.changes b/package/yast2-update.changes index 7146bc6..ac4d976 100644 --- a/package/yast2-update.changes +++ b/package/yast2-update.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Oct 31 12:29:07 UTC 2023 - Ladislav Slezák + +- Drop the previously used repositories when going back to the + partition selection at upgrade, this ensures the repositories + are correctly reinitialized later (bsc#1215884) +- 5.0.1 + ------------------------------------------------------------------- Wed Aug 30 20:16:10 UTC 2023 - Josef Reidinger diff --git a/package/yast2-update.spec b/package/yast2-update.spec index ce6baff..6b7bded 100644 --- a/package/yast2-update.spec +++ b/package/yast2-update.spec @@ -17,7 +17,7 @@ Name: yast2-update -Version: 5.0.0 +Version: 5.0.1 Release: 0 Summary: YaST2 - Update Group: System/YaST diff --git a/src/include/update/rootpart.rb b/src/include/update/rootpart.rb index a3857f0..7a9ce65 100644 --- 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,11 @@ 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)