summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlexandru Scvortov <alexandru@rabbitmq.com>2011-09-09 18:12:45 +0100
committerAlexandru Scvortov <alexandru@rabbitmq.com>2011-09-09 18:12:45 +0100
commit7dc2d7adc16192fa1a86289ec90efbaf79aeb85a (patch)
tree0f8191a375bdb1cf9311707caf00fafda716039e /src
parent74bdd2d27cff3e43ad4fa760161ce19d3e8cbd81 (diff)
downloadrabbitmq-server-git-7dc2d7adc16192fa1a86289ec90efbaf79aeb85a.tar.gz
favour plugins in the distribution dir, not in the plugin dir
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_plugin.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_plugin.erl b/src/rabbit_plugin.erl
index b5bba917dc..f0054da5b5 100644
--- a/src/rabbit_plugin.erl
+++ b/src/rabbit_plugin.erl
@@ -80,8 +80,8 @@ action(list, [], _Opts, PluginsDir, PluginsDistDir) ->
format_plugins(find_plugins(PluginsDir), find_plugins(PluginsDistDir));
action(enable, ToEnable, _Opts, PluginsDir, PluginsDistDir) ->
- AllPlugins = usort_plugins(find_plugins(PluginsDir) ++
- find_plugins(PluginsDistDir)),
+ AllPlugins = usort_plugins(find_plugins(PluginsDistDir) ++
+ find_plugins(PluginsDir)),
ToEnable1 = [list_to_atom(Name) || Name <- ToEnable],
{Found, Missing} = lists:foldl(fun (#plugin{name = Name}, {Fs, Ms}) ->
case lists:member(Name, Ms) of