livepatch-charmers team mailing list archive

[Barry Price <barry.price@xxxxxxxxxxxxx>]

Barry Price has proposed merging ~barryprice/canonical-livepatch-charm/+git/canonical-livepatch-charm:master into canonical-livepatch-charm:master.

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

Requested reviews:
  Livepatch charm developers (livepatch-charmers)

For more details, see:
https://code.launchpad.net/~barryprice/canonical-livepatch-charm/+git/canonical-livepatch-charm/+merge/356057
-- 
Your team Livepatch charm developers is requested to review the proposed merge of ~barryprice/canonical-livepatch-charm/+git/canonical-livepatch-charm:master into canonical-livepatch-charm:master.

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')