Merge remote-tracking branch 'origin/SLE-15-SP6' into merge_sp6

yast · Jan 17, 2024 · d449a26 · d449a26
2 parents b3e78e0 + 873e929
commit d449a26
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/package/yast2-update.changes b/package/yast2-update.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jan 17 11:56:33 UTC 2024 - Josef Reidinger <[email protected]>
+
+- Show the block device selected for upgrade in the installation
+  proposal (jsc#PED-3773)
+- 5.0.2
+
 -------------------------------------------------------------------
 Tue Oct 31 12:29:07 UTC 2023 - Ladislav Slezák <[email protected]>
 

diff --git a/package/yast2-update.spec b/package/yast2-update.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-update
-Version:        5.0.1
+Version:        5.0.2
 Release:        0
 Summary:        YaST2 - Update
 Group:          System/YaST

diff --git a/src/clients/update_proposal.rb b/src/clients/update_proposal.rb
@@ -188,8 +188,15 @@ def main
 
         products = Y2Packager::Resolvable.find(kind: :product)
         # stores the proposal text output
-        @summary_text = Packages.product_update_summary(products)
+        summary_text = Packages.product_update_summary(products)
           .map { |item| "<li>#{item}</li>" }.join
+        product_info = "<li>" + format(
+          _("Updating %{product} on root %{partition}"),
+          product:   RootPart.GetInfoOfSelected(:name),
+          partition: RootPart.selectedRootPartition
+        ) + "</li>"
+
+        summary_text = product_info + summary_text
 
         # recalculate the disk space usage data
         SpaceCalculation.GetPartitionInfo
@@ -204,7 +211,7 @@ def main
 
         @ret = {
           "preformatted_proposal" => Ops.add(
-            Ops.add(HTML.ListStart, @summary_text),
+            Ops.add(HTML.ListStart, summary_text),
             HTML.ListEnd
           ),
           "help"                  => @update_options_help