From 9fbfa0fe708f81386688c8ad9c11e22fbdcdde3a Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 1 Sep 2023 22:38:02 +0200 Subject: [PATCH 1/4] Bump version to 4.6.0 --- package/yast2-update.changes | 5 +++++ package/yast2-update.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package/yast2-update.changes b/package/yast2-update.changes index 89304a4..96dfd6b 100644 --- a/package/yast2-update.changes +++ b/package/yast2-update.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 01 19:57:03 UTC 2023 - Josef Reidinger + +- Branch package for SP6 (bsc#1208913) + ------------------------------------------------------------------- Wed Apr 12 08:37:15 UTC 2023 - Ladislav Slezák diff --git a/package/yast2-update.spec b/package/yast2-update.spec index 34c487d..2e3fa23 100644 --- a/package/yast2-update.spec +++ b/package/yast2-update.spec @@ -17,7 +17,7 @@ Name: yast2-update -Version: 4.5.3 +Version: 4.6.0 Release: 0 Summary: YaST2 - Update Group: System/YaST From d5a42abfbfde81f2e74f798cd3feebb6f3245f10 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 8 Sep 2023 22:40:17 +0200 Subject: [PATCH 2/4] bump version --- package/yast2-update.changes | 1 + package/yast2-update.spec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/yast2-update.changes b/package/yast2-update.changes index 96dfd6b..de4cb7e 100644 --- a/package/yast2-update.changes +++ b/package/yast2-update.changes @@ -2,6 +2,7 @@ Fri Sep 01 19:57:03 UTC 2023 - Josef Reidinger - Branch package for SP6 (bsc#1208913) +- 4.6.1 ------------------------------------------------------------------- Wed Apr 12 08:37:15 UTC 2023 - Ladislav Slezák diff --git a/package/yast2-update.spec b/package/yast2-update.spec index 2e3fa23..816c622 100644 --- a/package/yast2-update.spec +++ b/package/yast2-update.spec @@ -17,7 +17,7 @@ Name: yast2-update -Version: 4.6.0 +Version: 4.6.1 Release: 0 Summary: YaST2 - Update Group: System/YaST From 27f370c76040dbf764e9e8bfc12cd83b5d32c048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Fri, 27 Oct 2023 16:19:35 +0200 Subject: [PATCH 3/4] Drop the previously used repositories when going back (bsc#1215884) - 4.5.4 --- package/yast2-update.changes | 8 ++++++++ package/yast2-update.spec | 2 +- src/include/update/rootpart.rb | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/package/yast2-update.changes b/package/yast2-update.changes index 89304a4..223ce95 100644 --- a/package/yast2-update.changes +++ b/package/yast2-update.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Oct 27 13:58:30 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) +- 4.5.4 + ------------------------------------------------------------------- Wed Apr 12 08:37:15 UTC 2023 - Ladislav Slezák diff --git a/package/yast2-update.spec b/package/yast2-update.spec index 34c487d..1d48885 100644 --- a/package/yast2-update.spec +++ b/package/yast2-update.spec @@ -17,7 +17,7 @@ Name: yast2-update -Version: 4.5.3 +Version: 4.5.4 Release: 0 Summary: YaST2 - Update Group: System/YaST diff --git a/src/include/update/rootpart.rb b/src/include/update/rootpart.rb index a3857f0..6df1cf2 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,10 @@ 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) From f2bd556fc9a53847574064f520948a70b6b198e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Fri, 27 Oct 2023 16:24:17 +0200 Subject: [PATCH 4/4] Less strict Rubocop rules, this is old (formely YCP) code... --- .rubocop.yml | 6 +++--- src/include/update/rootpart.rb | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) 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/src/include/update/rootpart.rb b/src/include/update/rootpart.rb index 6df1cf2..7a9ce65 100644 --- a/src/include/update/rootpart.rb +++ b/src/include/update/rootpart.rb @@ -456,8 +456,9 @@ 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... :-/ + # 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