Merge ~ballot/charm-canonical-livepatch/+git/charm-canonical-livepatch:lp1926438 into charm-canonical-livepatch:master

[Benjamin Allot]

Restore charm functionality on Trusty

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[Barry Price (barryprice)]

LGTM +1

review: Approve

[Junien F (axino)]

+1

review: Approve

[Drew Freiberger (afreiberger)]

Tested fine on bionic. xenial test fails with lp#1916672, known issue.

Trusty works now.

Merging, then stripping off to stable/trusty so that wheelhouse tenacity doesn't update further for trusty clients.

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 2761cbb8cb954ebf398552bedf81255db912eb8e

diff --git a/src/reactive/canonical_livepatch.py b/src/reactive/canonical_livepatch.py
index c1720e3..e4a8540 100644
--- a/src/reactive/canonical_livepatch.py
+++ b/src/reactive/canonical_livepatch.py
@@ -57,19 +57,22 @@ def unit_update(status=None, message=None):
     if status and message:
         hookenv.status_set(status, message)
     else:
-        revision = ''
-        if path.exists('version'):
-            with open('version') as f:
+        revision = ""
+        if path.exists("version"):
+            with open("version") as f:
                 line = f.readline().strip()
             # We only want the first 8 characters, that's enough to tell
             # which version of the charm we're using.
             if len(line) > 8:
-                revision = ' (source version/commit {}…)'.format(line[:8])
+                revision = " (source version/commit {}…)".format(line[:8])
             else:
-                revision = ' (source version/commit {})'.format(line)
+                revision = " (source version/commit {})".format(line)
         patch_details = get_patch_details()
         hookenv.status_set(
-            "active", "Running kernel {}, patchState: {}{}".format(*patch_details, revision)
+            "active",
+            "Running kernel {}, patchState: {}{}".format(
+                patch_details[0], patch_details[1], revision
+            ),
         )
 
 
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
index 6af63cd..dac3eef 100644
--- a/src/wheelhouse.txt
+++ b/src/wheelhouse.txt
@@ -1 +1,2 @@
 charmhelpers>=0.11.0
+typing