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

Proposed by Barry Price
Status: Merged
Merged at revision: acd92afe8e03040cbc2db3408c41523fb3271bb1
Proposed branch: ~barryprice/charm-canonical-livepatch/+git/canonical-livepatch-charm:master
Merge into: ~livepatch-charmers/charm-canonical-livepatch:master
Diff against target: 25 lines (+5/-5)
1 file modified
files/check_canonical-livepatch.py (+5/-5)
Reviewer Review Type Date Requested Status
Livepatch charm developers Pending
Review via email: mp+355116@code.launchpad.net

Commit message

Remove spurious whitespace

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

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 e4eaa91..7878169 100755
3--- a/files/check_canonical-livepatch.py
4+++ b/files/check_canonical-livepatch.py
5@@ -53,15 +53,15 @@ def check_status():
6 line = line.strip()
7 if 'State:' in line:
8 if 'apply-failed' in line:
9- err_lines.append('Livepatch failed to apply patches. ')
10+ err_lines.append('Livepatch failed to apply patches.')
11 elif 'check-failed' in line:
12- err_lines.append('Livepatch failed to check the remote service for patches. ')
13+ err_lines.append('Livepatch failed to check the remote service for patches.')
14 elif 'unknown' in line:
15- err_lines.append('Livepatch reports an unknown error. ')
16+ err_lines.append('Livepatch reports an unknown error.')
17 elif 'kernel-upgrade-required' in line:
18- err_lines.append('A kernel upgrade (and reboot) is required. ')
19+ err_lines.append('A kernel upgrade (and reboot) is required.')
20 elif 'Machine is not enabled' in line:
21- err_lines.append('Machine is not enabled. ')
22+ err_lines.append('Machine is not enabled.')
23
24 if err_lines:
25 err = " ".join(err_lines)

Subscribers

People subscribed via source and target branches