Merge remote-tracking branch 'origin/SLE-15-SP7' into show_dialog_exp…

…licit
yast · Dec 17, 2024 · bd5ffb4 · bd5ffb4
2 parents 8405d71 + e95ed3f
commit bd5ffb4
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,9 +1,22 @@
 -------------------------------------------------------------------
-Tue Dec 17 12:56:21 UTC 2024 - Josef Reidinger <jreidinger@suse.com>
+Tue Dec 17 15:56:21 UTC 2024 - Josef Reidinger <jreidinger@suse.com>
 
 - skip showing reboot message in autoinstallation and
   autoupgrade mode only if not explicitly set on command line
   (bsc#1231522)
+- 4.7.3
+
+-------------------------------------------------------------------
+Tue Dec 17 15:05:22 UTC 2024 - Ladislav Slezák <lslezak@suse.com>
+
+- 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)
 - 4.7.2
 
 -------------------------------------------------------------------

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        4.7.2
+Version:        4.7.3
 Release:        0
 Summary:        YaST2 - Installation Parts
 License:        GPL-2.0-only

diff --git 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
@@ -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