Merge lp:~thomir-deactivatedaccount/charms/trusty/tanuki-result-enum-api/charm-remove-nagios-checks into lp:~tanuki/charms/trusty/tanuki-result-enum-api/trunk

[Thomi Richards]

Fix a bug where, if nagios checks are not already installed, the charm will fail.

Fix a bug where, if nagios checks are not already installed, the charm will fail.

[Guillermo Gonzalez (verterok)]

+1

Just a FYI, there is no need to copy stuff around. Using the full path should be enough

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-09-28 01:17:48 +0000
+++ hooks/actions.py	2015-09-28 22:42:18 +0000
@@ -209,6 +209,9 @@
         filename
     )
     dst = os.path.join('/usr/lib/nagios/plugins', filename)
+    dst_dir = os.path.dirname(dst)
+    if not os.path.exists(dst_dir):
+        os.makedirs(dst_dir)
     shutil.copy(src, dst)
     os.chmod(dst, 0o755)
     nrpe_compat = nrpe.NRPE()