Release Upgrader

Merge lp:~azzar1/ubuntu-release-upgrader/fix-lp-1816423 into lp:ubuntu-release-upgrader

  1. fix-lp-1816423
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Merged at revision: 3221
Proposed branch: lp:~azzar1/ubuntu-release-upgrader/fix-lp-1816423
Merge into: lp:ubuntu-release-upgrader
Diff against target: 13 lines (+2/-1)
1 file modified
DistUpgrade/DistUpgradeController.py (+2/-1)
To merge this branch: bzr merge lp:~azzar1/ubuntu-release-upgrader/fix-lp-1816423
Reviewer Review Type Date Requested Status
Brian Murray Approve
Review via email: mp+364146@code.launchpad.net

Commit message

To understand if livepatch is enabled check if the current release is an lts too.

To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

This looks good and I've added an appropriate changelog entry.

review: Approve
Revision history for this message
Brian Murray (brian-murray) wrote :

I'll get this merged and uploaded today.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'DistUpgrade/DistUpgradeController.py'
2--- DistUpgrade/DistUpgradeController.py 2019-01-17 14:53:37 +0000
3+++ DistUpgrade/DistUpgradeController.py 2019-03-08 11:01:43 +0000
4@@ -1153,7 +1153,8 @@
5 return res
6
7 def _isLivepatchEnabled(self):
8- return os.path.isfile('/var/snap/canonical-livepatch/common/machine-token')
9+ di = distro_info.UbuntuDistroInfo()
10+ return di.is_lts(self.fromDist) and os.path.isfile('/var/snap/canonical-livepatch/common/machine-token')
11
12 def askLivepatch(self):
13 di = distro_info.UbuntuDistroInfo()

Subscribers

People subscribed via source and target branches