diff options
| author | David Wragg <david@rabbitmq.com> | 2010-08-09 16:02:09 +0100 |
|---|---|---|
| committer | David Wragg <david@rabbitmq.com> | 2010-08-09 16:02:09 +0100 |
| commit | e6e6c6a683aa253995cb4b0984d767bbe8bbc3dd (patch) | |
| tree | 006ede9b3fadaae2cfd8c59d66c33e40330bb9af /src | |
| parent | 4ba0d184198d82c07fdcd73c321df397707ce2b2 (diff) | |
| parent | 49b3ba704e55902202f0f62f0e586fa9bc0109d3 (diff) | |
| download | rabbitmq-server-git-e6e6c6a683aa253995cb4b0984d767bbe8bbc3dd.tar.gz | |
Merge bug21875 into default
allow erlang and rabbit to be upgraded even when plugins are present
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_plugin_activator.erl | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/rabbit_plugin_activator.erl b/src/rabbit_plugin_activator.erl index 35b75a23a9..a170fb1da8 100644 --- a/src/rabbit_plugin_activator.erl +++ b/src/rabbit_plugin_activator.erl @@ -35,7 +35,6 @@ -define(DefaultPluginDir, "plugins"). -define(DefaultUnpackedPluginDir, "priv/plugins"). --define(DefaultRabbitEBin, "ebin"). -define(BaseApps, [rabbit]). %%---------------------------------------------------------------------------- @@ -58,9 +57,8 @@ start() -> %% Determine our various directories PluginDir = get_env(plugins_dir, ?DefaultPluginDir), UnpackedPluginDir = get_env(plugins_expand_dir, ?DefaultUnpackedPluginDir), - RabbitEBin = get_env(rabbit_ebin, ?DefaultRabbitEBin), - RootName = RabbitEBin ++ "/rabbit", + RootName = UnpackedPluginDir ++ "/rabbit", %% Unpack any .ez plugins unpack_ez_plugins(PluginDir, UnpackedPluginDir), @@ -86,7 +84,7 @@ start() -> {erts, erlang:system_info(version)}, AppVersions}, - %% Write it out to ebin/rabbit.rel + %% Write it out to $RABBITMQ_PLUGINS_EXPAND_DIR/rabbit.rel file:write_file(RootName ++ ".rel", io_lib:format("~p.~n", [RDesc])), %% Compile the script |