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

[Barry Price]

If ksplice is installed, let's cowardly refuse to install livepatch

[Stuart Bishop (stub)]

LGTM

review: Approve

diff --git a/reactive/canonical_livepatch.py b/reactive/canonical_livepatch.py
index 8bdb830..c2fb420 100644
--- a/reactive/canonical_livepatch.py
+++ b/reactive/canonical_livepatch.py
@@ -218,8 +218,12 @@ def canonical_livepatch_connect():
                          universal_newlines=True).strip()
     current = LooseVersion(uname)
     required = LooseVersion('4.4')
-    if current < required:
-        hookenv.log('We need to reboot, kernel {} is too old'.format(current))
+    uptrack_path = '/usr/sbin/uptrack-upgrade'
+    if path.exists(uptrack_path):
+        hookenv.log('Ksplice/Uptrack detected, please remove it and reboot')
+        unit_update('blocked', 'Remove ksplice and then reboot')
+    elif current < required:
+        hookenv.log('Reboot required, kernel {} is too old'.format(current))
         unit_update('blocked', 'A reboot is required')
     else:
         unit_update('maintenance', 'Connecting to the livepatch service')