From c4aaff7a06f55b555f9278ff20e8225a724d9faa Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Sun, 31 Jan 2016 11:11:46 -0600
Subject: don't lose overrides in an app when installing plugins it uses'

---
 src/rebar_plugins.erl | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/rebar_plugins.erl b/src/rebar_plugins.erl
index b4cc3ec..3c33498 100644
--- a/src/rebar_plugins.erl
+++ b/src/rebar_plugins.erl
@@ -42,10 +42,20 @@ project_apps_install(State) ->
 -spec install(rebar_state:t(), rebar_app_info:t()) -> rebar_state:t().
 install(State, AppInfo) ->
     Profiles = rebar_state:current_profiles(State),
-    lists:foldl(fun(Profile, StateAcc) ->
-                        Plugins = rebar_app_info:get(AppInfo, {plugins, Profile}, []),
-                        handle_plugins(Profile, Plugins, StateAcc)
-                end, State, Profiles).
+
+    %% don't lose the overrides of the dep we are processing plugins for
+    Overrides = rebar_app_info:get(AppInfo, overrides, []),
+    StateOverrides = rebar_state:get(State, overrides, []),
+    AllOverrides = Overrides ++ StateOverrides,
+    State1 = rebar_state:set(State, overrides, AllOverrides),
+
+    State2 = lists:foldl(fun(Profile, StateAcc) ->
+                             Plugins = rebar_app_info:get(AppInfo, {plugins, Profile}, []),
+                             handle_plugins(Profile, Plugins, StateAcc)
+                         end, State1, Profiles),
+
+    %% Reset the overrides after processing the dep
+    rebar_state:set(State2, overrides, StateOverrides).
 
 handle_plugins(Profile, Plugins, State) ->
     handle_plugins(Profile, Plugins, State, false).
-- 
cgit v1.1