From: Thomas Goirand Date: Thu, 19 May 2016 13:08:46 +0000 (+0200) Subject: * Check if /usr/bin/ceilometer-collector is there before attempting to call X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2784b86d66e406e8f78d6d93bf518d93ffc5043f;p=openstack-build%2Fceilometer-build.git * 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/xenial/debian/ceilometer-collector.cron.daily b/xenial/debian/ceilometer-collector.cron.daily index 626e82a..baf3c6a 100644 --- a/xenial/debian/ceilometer-collector.cron.daily +++ b/xenial/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/xenial/debian/changelog b/xenial/debian/changelog index 31b04da..2b98e1e 100644 --- a/xenial/debian/changelog +++ b/xenial/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 Thu, 19 May 2016 10:48:09 +0200