Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[master] Fixed reusing old repositories with new URL #193

Merged
merged 9 commits into from
Oct 31, 2023
6 changes: 3 additions & 3 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Lint/UnderscorePrefixedVariableName:

# Offense count: 25
Metrics/AbcSize:
Max: 188
Max: 190

# Offense count: 23
# Configuration parameters: CountComments, ExcludedMethods.
Expand All @@ -40,7 +40,7 @@ Metrics/ClassLength:

# Offense count: 25
Metrics/CyclomaticComplexity:
Max: 46
Max: 50

# Offense count: 27
# Configuration parameters: CountComments, ExcludedMethods.
Expand All @@ -54,7 +54,7 @@ Metrics/ModuleLength:

# Offense count: 24
Metrics/PerceivedComplexity:
Max: 55
Max: 60

# Offense count: 49
# Configuration parameters: EnforcedStyle.
Expand Down
8 changes: 8 additions & 0 deletions package/yast2-update.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Oct 31 12:29:07 UTC 2023 - Ladislav Slezák <[email protected]>

- 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 <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-update.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-update
Version: 5.0.0
Version: 5.0.1
Release: 0
Summary: YaST2 - Update
Group: System/YaST
Expand Down
6 changes: 6 additions & 0 deletions src/include/update/rootpart.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand Down
Loading