summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFred Hebert <mononcqc@ferd.ca>2015-06-26 19:59:11 -0400
committerFred Hebert <mononcqc@ferd.ca>2015-06-26 19:59:11 -0400
commite28ebaa95725698bfed110804e0448c073c98531 (patch)
treeab6f0e51d1d0bb8cfa0769f8ace138e01aa91361 /src
parenteeb2bf47d0d9b8e503b0cee16ae6345e7e0e45c0 (diff)
parent5402199d88c56dec08a8c3d052a4db1e84f2dc1d (diff)
Merge pull request #550 from tsloughter/master
expand plugins for profile after applying profiles
Diffstat (limited to 'src')
-rw-r--r--src/rebar_prv_install_deps.erl7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index cfce1b7..768d41a 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -386,10 +386,9 @@ handle_dep(State, Profile, DepsDir, AppInfo, Locks, Level) ->
S1 = rebar_state:new(S, C, rebar_app_info:dir(AppInfo)),
S2 = rebar_state:apply_overrides(S1, Name),
- Plugins = rebar_state:get(S2, plugins, []),
- S3 = rebar_state:set(S2, {plugins, Profile}, Plugins),
-
- S4 = rebar_state:apply_profiles(S3, Profiles),
+ S3 = rebar_state:apply_profiles(S2, Profiles),
+ Plugins = rebar_state:get(S3, plugins, []),
+ S4 = rebar_state:set(S3, {plugins, Profile}, Plugins),
AppInfo1 = rebar_app_info:state(AppInfo, S4),
%% Dep may have plugins to install. Find and install here.