Merge lp:~mthaddon/charms/precise/nrpe-external-master/nagios-plugin-fix into lp:charms/nrpe-external-master

[Tom Haddon]

Fix line breaks in nagios_plugin.py

[Matthew Wedgwood (mew)]

This is Matthew and I approve this merge.

review: Approve

=== modified file 'files/nagios_plugin.py'
--- files/nagios_plugin.py	2012-10-02 19:33:44 +0000
+++ files/nagios_plugin.py	2013-04-18 15:47:28 +0000
@@ -67,12 +67,10 @@
     mtime = os.stat(filename)[stat.ST_MTIME]
     last_modified = time.time() - mtime
     if last_modified > newer_than:
-        raise CriticalError("%s: was last modified on %s and is too old (> %s
-seconds)."
+        raise CriticalError("%s: was last modified on %s and is too old (> %s seconds)."
                             % (filename, time.ctime(mtime), newer_than))
     if last_modified < 0:
-        raise CriticalError("%s: was last modified on %s which is in the
-future."
+        raise CriticalError("%s: was last modified on %s which is in the future."
                             % (filename, time.ctime(mtime)))
 
 ################################################################################

=== modified file 'hooks/install'
--- hooks/install	2012-11-26 04:29:01 +0000
+++ hooks/install	2013-04-18 15:47:28 +0000
@@ -8,12 +8,19 @@
 while true; do
     lsof /var/lib/dpkg/lock > /dev/null 2>&1 || APT_LOCKED=0
     if [[ $APT_LOCKED -eq 0 ]]; then
+        RET=0
+        # It's possible that if multiple subordinate charms attempt to install
+        # a package at exactly the same time neither will see the dpkg lock but
+        # then when attempting to actually install they'll conflict. If so, just
+        # ignore and try again in another minute, by which time hopefully it
+        # will have finished.
         apt-get install -q -y nagios-nrpe-server \
             nagios-plugins-basic \
             nagios-plugins-standard \
             rsync \
-            python-cheetah
-        break
+            python-cheetah || RET=$? && [[ $RET -ne 100 ]] \
+                && [[ $RET -ne 0 ]] && exit $RET
+        [[ $RET -eq 100 ]] || break
     fi
     if [[ $COUNTER -gt 5 ]]; then
         echo "Failed to obtain apt lock"