Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add product update summary to proposal (jsc#PED-3773) #195

Merged
merged 3 commits into from
Jan 17, 2024
Merged

add product update summary to proposal (jsc#PED-3773) #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9814295
add product update summary to proposal (jsc#PED-3773)
jreidinger Jan 16, 2024
06a673b
changes
jreidinger Jan 17, 2024
d896a28
more precise changelog
jreidinger Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions package/yast2-update.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jan 17 11:56:33 UTC 2024 - Josef Reidinger <jreidinger@suse.com>

- 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 <lslezak@suse.com>

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-update.spec
View file
Open in desktop
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
View file
Open in desktop
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please check an installation with LVM? Just to be sure that #selectedRootPartition contains theh value in that case.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeap, here is partition selection and also summary. So we are consistent:
show_partition_lvm
upgrade_selection

) + "</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
Loading