From 981429523e5af24dfd219124e0cb8db7226a0199 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 16 Jan 2024 10:55:13 +0100 Subject: [PATCH 1/3] add product update summary to proposal (jsc#PED-3773) --- src/clients/update_proposal.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/clients/update_proposal.rb b/src/clients/update_proposal.rb index 1f6570c..2586c3c 100644 --- a/src/clients/update_proposal.rb +++ b/src/clients/update_proposal.rb @@ -187,8 +187,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| "
  • #{item}
  • " }.join + product_info = "
  • " + format( + _("Updating %{product} on root %{partition}"), + product: RootPart.GetInfoOfSelected(:name), + partition: RootPart.selectedRootPartition + ) + "
  • " + + summary_text = product_info + summary_text # recalculate the disk space usage data SpaceCalculation.GetPartitionInfo @@ -203,7 +210,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 From 06a673b2c4c98240674d9db52529944171312b51 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 17 Jan 2024 12:57:30 +0100 Subject: [PATCH 2/3] changes --- package/yast2-update.changes | 7 +++++++ package/yast2-update.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/yast2-update.changes b/package/yast2-update.changes index 8fbad10..83dbfc0 100644 --- a/package/yast2-update.changes +++ b/package/yast2-update.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jan 17 11:56:33 UTC 2024 - Josef Reidinger + +- Show the partition selected for upgrade in the installation + proposal (jsc#PED-3773) +- 4.6.3 + ------------------------------------------------------------------- Tue Oct 31 08:36:56 UTC 2023 - Ladislav Slezák diff --git a/package/yast2-update.spec b/package/yast2-update.spec index b31a127..ef1b61d 100644 --- a/package/yast2-update.spec +++ b/package/yast2-update.spec @@ -17,7 +17,7 @@ Name: yast2-update -Version: 4.6.2 +Version: 4.6.3 Release: 0 Summary: YaST2 - Update Group: System/YaST From d896a282ee115ccf783d7bc820ae22a935557a07 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Wed, 17 Jan 2024 14:40:37 +0100 Subject: [PATCH 3/3] more precise changelog --- package/yast2-update.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/yast2-update.changes b/package/yast2-update.changes index 83dbfc0..d3d29b4 100644 --- a/package/yast2-update.changes +++ b/package/yast2-update.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed Jan 17 11:56:33 UTC 2024 - Josef Reidinger -- Show the partition selected for upgrade in the installation +- Show the block device selected for upgrade in the installation proposal (jsc#PED-3773) - 4.6.3