Canonical Livepatch Charm

Merge ~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm:master into ~livepatch-charmers/charm-canonical-livepatch:master

  1. Git
  2. lp:~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm
  3. master
  4. Merge into master
Proposed by Barry Price
Status: Merged
Merged at revision: 2da133d246d4d0def848a68a29f8e4bc069718e1
Proposed branch: ~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm:master
Merge into: ~livepatch-charmers/charm-canonical-livepatch:master
Diff against target: 13 lines (+2/-0)
1 file modified
files/check_canonical-livepatch.py (+2/-0)
Reviewer Review Type Date Requested Status
Livepatch charm developers Pending
Review via email: mp+312525@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/files/check_canonical-livepatch.py b/files/check_canonical-livepatch.py
2index bf053f5..8bf2646 100644
3--- a/files/check_canonical-livepatch.py
4+++ b/files/check_canonical-livepatch.py
5@@ -56,6 +56,8 @@ def check_status():
6 err_lines.append('Check failed')
7 elif 'unknown' in line:
8 err_lines.append('Unknown error')
9+ elif 'Machine is not enabled' in line:
10+ err_lines.append('Machine is not enabled')
11
12 if err_lines:
13 err = " ".join(err_lines)

Subscribers

People subscribed via source and target branches