summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2015-10-28 18:09:00 +0100
committerJean-Sébastien Pédron <jean-sebastien@rabbitmq.com>2015-10-28 18:09:00 +0100
commit9c722e93624d5e423f621e5c99e77d6e4b8ab036 (patch)
treed7be189314588108694d4ec43a1505fc1a2f23da /packaging
parent983a7321339109f15f35cfc151b9be86168de2ef (diff)
downloadrabbitmq-server-git-9c722e93624d5e423f621e5c99e77d6e4b8ab036.tar.gz
packaging/standalone: Ensure plugin deps are listed once in the rel script
Otherwise, systools complains with eg: Duplicated register names: ssl_sup registered in ssl and ssl ssl_manager registered in ssl and ssl ...
Diffstat (limited to 'packaging')
-rw-r--r--packaging/standalone/src/rabbit_release.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/packaging/standalone/src/rabbit_release.erl b/packaging/standalone/src/rabbit_release.erl
index 21bf2484c5..4e16fd52b5 100644
--- a/packaging/standalone/src/rabbit_release.erl
+++ b/packaging/standalone/src/rabbit_release.erl
@@ -56,7 +56,9 @@ start() ->
%% we need a list of ERTS apps we need to ship with rabbit
{ok, SslAppsConfig} = application:get_env(rabbit, ssl_apps),
- BaseApps = SslAppsConfig ++ AllApps -- PluginAppNames,
+ BaseApps = lists:umerge(
+ lists:sort(SslAppsConfig),
+ lists:sort(AllApps -- PluginAppNames)),
AppVersions = [determine_version(App) || App <- BaseApps],
RabbitVersion = proplists:get_value(rabbit, AppVersions),