Skip to content

Commit

Permalink
Merge pull request #195 from yast/show_partition
Browse files Browse the repository at this point in the history
add product update summary to proposal (jsc#PED-3773)
  • Loading branch information
jreidinger authored Jan 17, 2024
2 parents a2b7b51 + d896a28 commit 873e929
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
7 changes: 7 additions & 0 deletions package/yast2-update.changes
Original file line number Diff line number Diff line change
@@ -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)
- 4.6.3

-------------------------------------------------------------------
Tue Oct 31 08:36:56 UTC 2023 - Ladislav Slezák <[email protected]>

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-update.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-update
Version: 4.6.2
Version: 4.6.3
Release: 0
Summary: YaST2 - Update
Group: System/YaST
Expand Down
11 changes: 9 additions & 2 deletions src/clients/update_proposal.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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| "<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
Expand All @@ -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
Expand Down

0 comments on commit 873e929

Please sign in to comment.