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

Proposed by Nathan Teodosio
Status: Merged
Approved by: Sebastien Bacher
Approved revision: f390c08b175aeddd906c4ef2406a1c2f5966884d
Merged at revision: ffa83d8131607efaae4da68b12e0ca5434a5ed82
Proposed branch: ~nteodosio/update-manager:dont-nag-pro-xenial
Merge into: update-manager:ubuntu/xenial
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+459442@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 514e555..c8f531b 100644
3--- a/UpdateManager/UpdateManager.py
4+++ b/UpdateManager/UpdateManager.py
5@@ -263,7 +263,7 @@ class UpdateManager(Gtk.Window):
6
7 def _make_available_pane(self, install_count, need_reboot=False,
8 cancelled_update=False, error_occurred=False):
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 10741f7..6b90286 100644
16--- a/debian/changelog
17+++ b/debian/changelog
18@@ -1,3 +1,11 @@
19+update-manager (1:16.04.21) xenial; 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 15:11:20 +0100
26+
27 update-manager (1:16.04.20) xenial; urgency=medium
28
29 * Drop call to ua security-status --format=json.

Subscribers

People subscribed via source and target branches