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

[Barry Price]

Drop universal_newlines in the Nagios check, force UTF-8 (the livepatch client emits unicode output)

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

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

[Junien F (axino)]

+1

review: Approve

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

Change successfully merged at revision 4a771f94bc8f0de472b8fbff4aaba6d54c0140a1

diff --git a/files/check_canonical-livepatch.py b/files/check_canonical-livepatch.py
index 0d2a1a3..cafd472 100755
--- a/files/check_canonical-livepatch.py
+++ b/files/check_canonical-livepatch.py
@@ -14,7 +14,7 @@ def check_snap_installed():
     """Confirm the snap is installed, raise an error if not"""
     cmd = ['snap', 'list', 'canonical-livepatch']
     try:
-        check_output(cmd, universal_newlines=True)
+        check_output(cmd).decode('UTF-8')
     except Exception:
         raise nagios_plugin3.CriticalError('canonical-livepatch snap is not installed')
 
diff --git a/reactive/canonical_livepatch.py b/reactive/canonical_livepatch.py
index e8ba806..c933113 100644
--- a/reactive/canonical_livepatch.py
+++ b/reactive/canonical_livepatch.py
@@ -169,7 +169,7 @@ def livepatch_supported():
 
 
 @when('canonical-livepatch.supported')
-@when_not('snap.livepatch.installed')
+@when_not('snap.installed.canonical-livepatch')
 def install_livepatch():
     config = hookenv.config()
     snap_channel = config.get('snap_channel')