diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2020-04-06 14:09:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-06 14:09:31 +0200 |
| commit | 7f614f13adad5cf278d56083cd6ba8f72d33a9e3 (patch) | |
| tree | 348b427c57852abf8349e1d84bd7ac1494464e19 /scripts | |
| parent | bfc5959444f7e650dced2fe7ebabb5cfc2bf3821 (diff) | |
| parent | be9a642f928816f9d02856012ff6d7a421004c1e (diff) | |
| download | rabbitmq-server-git-7f614f13adad5cf278d56083cd6ba8f72d33a9e3.tar.gz | |
Merge pull request #2302 from rabbitmq/work-around-cli-circular-dep-in-feature_flags_SUITE
feature_flags_SUITE: Work around CLI/rabbitmq-server circular dependency
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rabbitmq-env | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rabbitmq-env b/scripts/rabbitmq-env index 48aa3e12ee..214285a9af 100755 --- a/scripts/rabbitmq-env +++ b/scripts/rabbitmq-env @@ -105,8 +105,8 @@ saved_RABBITMQ_PID_FILE="$RABBITMQ_PID_FILE" ## Get configuration variables from the configure environment file [ "x" = "x$RABBITMQ_CONF_ENV_FILE" ] && RABBITMQ_CONF_ENV_FILE=${CONF_ENV_FILE} if [ -f "${RABBITMQ_CONF_ENV_FILE}" ]; then - CONF_ENV_FILE_PHASE=rabbitmq-env - . ${RABBITMQ_CONF_ENV_FILE} || true + CONF_ENV_FILE_PHASE=rabbitmq-env + . ${RABBITMQ_CONF_ENV_FILE} || true fi [ -n "$ERL_EPMD_PORT" ] && export ERL_EPMD_PORT |