Merge ~nteodosio/update-manager:dont-nag-pro-jammy into update-manager:ubuntu/jammy

Proposed by Nathan Teodosio
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 7fa6aeb8aba14236783d1587995ebfdb922636d5
Merged at revision: be6765f9c1f010d7562b02d4598bd0ad0a6eb493
Proposed branch: ~nteodosio/update-manager:dont-nag-pro-jammy
Merge into: update-manager:ubuntu/jammy
Diff against target: 29 lines (+9/-1)
2 files modified
UpdateManager/UpdateManager.py (+1/-1)
debian/changelog (+8/-0)
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+459440@code.launchpad.net

Description of the change

Do not show the list of packages if the machine is not attached to Ubuntu Pro and only those coming from Ubuntu Pro are available.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
2index 89d570a..4ed2fc3 100644
3--- a/UpdateManager/UpdateManager.py
4+++ b/UpdateManager/UpdateManager.py
5@@ -306,7 +306,7 @@ class UpdateManager(Gtk.Window):
6 def _make_available_pane(self, install_count, need_reboot=False,
7 cancelled_update=False, error_occurred=False):
8 self._check_hwe_support_status()
9- if install_count != 0 or len(self.ua_security_packages) > 0:
10+ if install_count != 0:
11 header = None
12 desc = None
13 if error_occurred:
14diff --git a/debian/changelog b/debian/changelog
15index 0d6acb6..ef852ab 100644
16--- a/debian/changelog
17+++ b/debian/changelog
18@@ -1,3 +1,11 @@
19+update-manager (1:22.04.20) jammy; urgency=medium
20+
21+ * The New Release dialog should take precedence over a list of updates dialog
22+ if the latter would only show Ubuntu Pro updates in an unattached system.
23+ (LP: #2051115).
24+
25+ -- Nathan Pratta Teodosio <nathan.teodosio@canonical.com> Thu, 25 Jan 2024 14:56:36 +0100
26+
27 update-manager (1:22.04.19) jammy; urgency=medium
28
29 * Drop call to ua security-status --format=json.

Subscribers

People subscribed via source and target branches