Merge lp:~azzar1/update-manager/fix-lp-1805118 into lp:update-manager

Proposed by Andrea Azzarone on 2018-11-27
Status: Merged
Approved by: Sebastien Bacher on 2018-11-27
Approved revision: 2846
Merged at revision: 2845
Proposed branch: lp:~azzar1/update-manager/fix-lp-1805118
Merge into: lp:update-manager
Diff against target: 26 lines (+8/-0)
2 files modified
UpdateManager/Dialogs.py (+1/-0)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~azzar1/update-manager/fix-lp-1805118
Reviewer Review Type Date Requested Status
Sebastien Bacher 2018-11-27 Approve on 2018-11-27
Review via email: mp+359621@code.launchpad.net

Commit message

self.button_settings can be None in case update-manager is running in a distribution that does not ship software-properties-gtk. Do not show the canonical-livepatch reminder if self.button_settings is None.

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

Nice and makes sense, I like it :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'UpdateManager/Dialogs.py'
2--- UpdateManager/Dialogs.py 2018-10-01 15:56:40 +0000
3+++ UpdateManager/Dialogs.py 2018-11-27 13:36:00 +0000
4@@ -158,6 +158,7 @@
5
6 if not active:
7 if self._is_livepatch_supported() and \
8+ self.settings_button and \
9 self.settings.get_int('launch-count') >= 4:
10 self.set_desc(_("<b>Tip:</b> You can use Livepatch to "
11 "keep your computer more secure between "
12
13=== modified file 'debian/changelog'
14--- debian/changelog 2018-10-04 19:07:15 +0000
15+++ debian/changelog 2018-11-27 13:36:00 +0000
16@@ -1,3 +1,10 @@
17+update-manager (1:19.04.1) UNRELEASED; urgency=medium
18+
19+ * Do not show the livepatch reminder if update-manager is running
20+ on a distribution without software-properties-gtk. (LP: #1805118)
21+
22+ -- Andrea Azzarone <andrea.azzarone@canonical.com> Tue, 27 Nov 2018 13:26:00 +0000
23+
24 update-manager (1:18.10.10) cosmic; urgency=medium
25
26 * Stop lazy import of InstallBackends.

Subscribers

People subscribed via source and target branches

to status/vote changes: