← Back to team overview

nagios-charmers team mailing list archive

[Merge] ~peter-sabaini/charm-nagios:fix/lp1893434 into charm-nagios:master

 

Peter Sabaini has proposed merging ~peter-sabaini/charm-nagios:fix/lp1893434 into charm-nagios:master.

Requested reviews:
  Nagios Charm developers (nagios-charmers)

For more details, see:
https://code.launchpad.net/~peter-sabaini/charm-nagios/+git/nagios-charm/+merge/391308
-- 
Your team Nagios Charm developers is requested to review the proposed merge of ~peter-sabaini/charm-nagios:fix/lp1893434 into charm-nagios:master.
diff --git a/hooks/upgrade_charm.py b/hooks/upgrade_charm.py
index ca410ef..4152e53 100755
--- a/hooks/upgrade_charm.py
+++ b/hooks/upgrade_charm.py
@@ -13,6 +13,13 @@ import stat
 import string
 import subprocess
 
+try:
+    from enum import Enum  # noqa: F401
+except ImportError:
+    subprocess.check_call(
+        "DEBIAN_FRONTEND=noninteractive apt-get -qy install python-enum34", shell=True
+    )
+
 from charmhelpers import fetch
 from charmhelpers.contrib import ssl
 from charmhelpers.core import hookenv, host

Follow ups