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

[Barry Price]

Properly trap/detect unsupported installs

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

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

[Stuart Bishop (stub)]

Looks good. The livepatch-proxy.configured flag name change is only partially complete, so this either needs to be finished or reverted. The flag names are inconsistent no matter which way you swing ;)

review: Approve

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

Change successfully merged at revision 26c99618e50c9103236913a303f720ee13c3ba9a

diff --git a/reactive/canonical_livepatch.py b/reactive/canonical_livepatch.py
index 7c0b559..de797ec 100644
--- a/reactive/canonical_livepatch.py
+++ b/reactive/canonical_livepatch.py
@@ -183,7 +183,7 @@ def activate_livepatch():
 register_trigger(when='config.changed.livepatch_proxy', clear_flag='livepatch-proxy.configured')
 
 
-@when_not('snap.installed.canonical-livepatch')
+@when('snap.installed.canonical-livepatch')
 def livepatch_supported():
     arch = uname()[4]
     opts = layer.options('snap')
@@ -191,11 +191,13 @@ def livepatch_supported():
     if supported_archs and arch not in supported_archs:
         hookenv.log('Livepatch does not currently support {} architecture'.format(arch))
         unit_update('blocked', 'Architecture {} is not supported by livepatch'.format(arch))
-    if is_container():
+    elif is_container():
         hookenv.log('OS container detected, livepatch is not needed')
         unit_update('blocked', 'Livepatch is not needed in OS containers')
+    else:
+        set_flag('canonical-livepatch.supported')
 
-
+@when('canonical-livepatch.supported')
 @when_not('livepatch-proxy.configured')
 def proxy_configure():
     # Configure proxies early, if required - LP#1761661