From fb6364678a75ce7a0bf32726ad18977cb28b34ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Tue, 17 Dec 2024 14:05:45 +0100 Subject: [PATCH 1/2] Self-update fix: remove the architecture suffix from the version when reading the /.packages.root file from the inst-sys --- src/lib/installation/instsys_packages.rb | 3 +++ test/instsys_packages_test.rb | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/lib/installation/instsys_packages.rb b/src/lib/installation/instsys_packages.rb index b7413356b..f3fa0273b 100644 --- a/src/lib/installation/instsys_packages.rb +++ b/src/lib/installation/instsys_packages.rb @@ -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 diff --git a/test/instsys_packages_test.rb b/test/instsys_packages_test.rb index 2ebe3ef77..2a1d19ead 100755 --- a/test/instsys_packages_test.rb +++ b/test/instsys_packages_test.rb @@ -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 From c1246bcb3ef8943439365f939cb8c1b6363b8674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Tue, 17 Dec 2024 16:31:58 +0100 Subject: [PATCH 2/2] Changes, version 4.6.14 --- package/yast2-installation.changes | 12 ++++++++++++ package/yast2-installation.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes index 4fe6ceb35..72ca39f7d 100644 --- a/package/yast2-installation.changes +++ b/package/yast2-installation.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Dec 17 15:05:22 UTC 2024 - Ladislav Slezák + +- 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 diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec index 57a4ff30b..4a3716a46 100644 --- a/package/yast2-installation.spec +++ b/package/yast2-installation.spec @@ -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