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.

Sign up for GitHub

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

[SLE15-SP6] Fixed comparing versions in the self-update version check #1130

Merged
merged 2 commits into from
Dec 17, 2024
Merged

[SLE15-SP6] Fixed comparing versions in the self-update version check #1130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb63646
Self-update fix: remove the architecture suffix
lslezak Dec 17, 2024
c1246bc
Changes, version 4.6.14
lslezak Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions package/yast2-installation.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Dec 17 15:05:22 UTC 2024 - Ladislav Slezák <[email protected]>

- Self-update fix (bsc#1234661)
- Properly compare the package versions from the inst-sys and
the self-update repository
- Remove the architecture suffix when reading the package version
from the inst-sys (the /.packages.root file)
- This fixes false alarm about incorrect self-update repository
when the installation is booted from PXE using the updated
tftpboot-installation-* packages (not the GA version)

-------------------------------------------------------------------
Tue Aug 27 09:06:22 UTC 2024 - Stefan Hundhammer <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-installation.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#

Name: yast2-installation
Version: 4.6.13
Version: 4.6.14
Release: 0
Summary: YaST2 - Installation Parts
License: GPL-2.0-only
Expand Down
3 changes: 3 additions & 0 deletions src/lib/installation/instsys_packages.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ def self.read(file = "/.packages.root")
name, version = /^(\S+) \[(\S+)\]/.match(line)[1, 2]
next unless name && version

# remove the architecture suffix
version.sub!(/\.(noarch|aarch64|i[3-6]86|ppc64|ppc64le|s390x?|x86_64)$/, "")

# nil repository ID
packages << Y2Packager::Package.new(name, nil, version)
end
Expand Down
8 changes: 7 additions & 1 deletion test/instsys_packages_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,15 @@

it "reads the package versions" do
pkgs = Installation::InstsysPackages.read(test_file)

yast2 = pkgs.find { |p| p.name == "yast2" }
yast2_add_on = pkgs.find { |p| p.name == "yast2-add-on" }

# no "x86_64" suffix
expect(yast2.version).to eq("4.2.67-1.7")

expect(yast2.version).to eq("4.2.67-1.7.x86_64")
# no "noarch" suffix
expect(yast2_add_on.version).to eq("4.2.15-1.30")
end
end
end
Loading