diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-09-18 11:40:01 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-09-18 11:40:01 +0100 |
| commit | b0e5b036fb31ea80d13d52e7be2ea4590963fc79 (patch) | |
| tree | 2f2ed0e7eef41dfea1095cb8310eea8a1707dee9 /src | |
| parent | 4844f3d4d2f3139d0aa5bdbac611975975c99e1c (diff) | |
| parent | 8eb153f1a87f8ac6028f3f7950ce221f42f4c4a0 (diff) | |
| download | rabbitmq-server-git-b0e5b036fb31ea80d13d52e7be2ea4590963fc79.tar.gz | |
Merge bug 26375 (again)
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_plugins.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/rabbit_plugins.erl b/src/rabbit_plugins.erl index 84a0d022e6..46e91e3556 100644 --- a/src/rabbit_plugins.erl +++ b/src/rabbit_plugins.erl @@ -163,8 +163,8 @@ prepare_plugins(Enabled) -> {ok, ExpandDir} = application:get_env(rabbit, plugins_expand_dir), AllPlugins = list(PluginsDistDir), - ToUnpack = dependencies(false, Enabled, AllPlugins), - ToUnpackPlugins = lookup_plugins(ToUnpack, AllPlugins), + Wanted = dependencies(false, Enabled, AllPlugins), + WantedPlugins = lookup_plugins(Wanted, AllPlugins), case filelib:ensure_dir(ExpandDir ++ "/") of ok -> ok; @@ -172,10 +172,11 @@ prepare_plugins(Enabled) -> [ExpandDir, E2]}}) end, - [prepare_plugin(Plugin, ExpandDir) || Plugin <- ToUnpackPlugins], + [prepare_plugin(Plugin, ExpandDir) || Plugin <- WantedPlugins], [prepare_dir_plugin(PluginAppDescPath) || - PluginAppDescPath <- filelib:wildcard(ExpandDir ++ "/*/ebin/*.app")]. + PluginAppDescPath <- filelib:wildcard(ExpandDir ++ "/*/ebin/*.app")], + Wanted. clean_plugins(Plugins) -> {ok, ExpandDir} = application:get_env(rabbit, plugins_expand_dir), |