* Check if /usr/bin/ceilometer-collector is there before attempting to call

    /usr/bin/ceilometer-expirer in the daily cron, so that there's no risk to
    have an output if the ceilometer-collector package is removed
    (Closes: #822897).

Rewritten-From: eb3e8ba6f43f0986246d7e096b5ac7714b5a6b12

diff --git a/trusty/debian/ceilometer-collector.cron.daily b/trusty/debian/ceilometer-collector.cron.daily
index 626e82a32bafdbccc7f473ff3af791b5725ec046..baf3c6af6812e730afe6bdf1f8bed7074d6e2e4b 100644 (file)
--- a/trusty/debian/ceilometer-collector.cron.daily
+++ b/trusty/debian/ceilometer-collector.cron.daily
@@ -1,4 +1,7 @@
 #!/bin/sh
 
-test -x /usr/bin/ceilometer-expirer || exit 0
-su -s /bin/sh -c "exec /usr/bin/ceilometer-expirer" ceilometer
+if [ -x /usr/bin/ceilometer-expirer ] && [ -x /usr/bin/ceilometer-collector ] ; then
+       su -s /bin/sh -c "exec /usr/bin/ceilometer-expirer" ceilometer
+fi
+
+exit 0

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 31b04daf06374004099dc84a98799e8d40b3ebdc..2b98e1edf0fe55cf51e3c2a24be841b637c467b3 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -8,6 +8,10 @@ ceilometer (1:6.0.0-2) UNRELEASED; urgency=medium
   * Updated Japanese debconf templates (Closes: #820760).
   * Updated Dutch debconf templates (Closes: #822966).
   * Added Brazilian Portuguese debconf templates (Closes: #824295).
+  * Check if /usr/bin/ceilometer-collector is there before attempting to call
+    /usr/bin/ceilometer-expirer in the daily cron, so that there's no risk to
+    have an output if the ceilometer-collector package is removed
+    (Closes: #822897).
 
  -- Thomas Goirand <zigo@debian.org>  Thu, 19 May 2016 10:48:09 +0200