Merge pull request #1132 from yast/merge_sp7

Merge sp7
yast · Dec 18, 2024 · 960c666 · 960c666
2 parents b7f3c57 + 143f021
commit 960c666
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 3 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+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)
+- 5.0.16
+
+-------------------------------------------------------------------
+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)
+
 -------------------------------------------------------------------
 Wed Oct 23 11:18:09 UTC 2024 - Josef Reidinger <jreidinger@suse.com>
 

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

diff --git a/src/lib/installation/clients/inst_finish.rb b/src/lib/installation/clients/inst_finish.rb
@@ -137,7 +137,6 @@ def write
 
     def report_messages
       return if Misc.boot_msg.empty?
-      return if Mode.auto
 
       # --------------------------------------------------------------
       # Check if there is a message left to display
@@ -148,6 +147,10 @@ def report_messages
       if Linuxrc.reboot_timeout
         Report.DisplayMessages(true, Linuxrc.reboot_timeout)
       else
+        # Skip in autoinstallation and autoupgrade mode only if not explicitly
+        # set on command line (bsc#1231522)
+        return if Mode.auto
+
         # Display the message and wait for user to accept it
         # also live installation - bzilla #297691
         Report.DisplayMessages(true,

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