summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-06-09 14:35:13 +0100
committerSimon MacMullen <simon@rabbitmq.com>2014-06-09 14:35:13 +0100
commit66dc4d62ed98f7391980a53c3d10baec9b9b43b2 (patch)
tree36b53d7b77e5750fd2a669eaab91c50532ec263d
parent95e4d716a66a541fdd6c16d0f12cc3ca471e5da4 (diff)
parent4e421e5c5bb6293250a2b404400de9c6bd06c1d6 (diff)
downloadrabbitmq-server-66dc4d62ed98f7391980a53c3d10baec9b9b43b2.tar.gz
Merge bug24759
-rwxr-xr-xscripts/rabbitmq-env2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env
index 2378e5e3..b7741670 100755
--- a/scripts/rabbitmq-env
+++ b/scripts/rabbitmq-env
@@ -52,4 +52,4 @@ if [ -f /etc/rabbitmq/rabbitmq.conf ] && \
fi
## Get configuration variables from the configure environment file
-[ -f ${CONF_ENV_FILE} ] && . ${CONF_ENV_FILE}
+[ -f ${CONF_ENV_FILE} ] && . ${CONF_ENV_FILE} || true