diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2015-06-24 21:02:39 -0400 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2015-06-24 21:02:39 -0400 |
| commit | ee286ed4431f368011eaaf8cbe079b9ec617c8fa (patch) | |
| tree | 1aebf0ba089ee5ba029b68354cca8dd23e45a6cc | |
| parent | c20ea1c924f4d9a36987b3a8a11b5749c7bbbe7a (diff) | |
| parent | f8bb088305f8ce0373e496dbd17ff5a1cfbdec3e (diff) | |
Merge pull request #537 from tsloughter/plugin_overrides
fix for overrides in plugins, simpler plugin state handling
| -rw-r--r-- | src/rebar_hooks.erl | 1 | ||||
| -rw-r--r-- | src/rebar_plugins.erl | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/rebar_hooks.erl b/src/rebar_hooks.erl index 734c15b..56c4e91 100644 --- a/src/rebar_hooks.erl +++ b/src/rebar_hooks.erl @@ -67,6 +67,7 @@ run_hooks(Dir, Type, Command, State) -> _ -> [] end, + Env = create_env(State), lists:foreach(fun({_, C, _}=Hook) when C =:= Command -> apply_hook(Dir, Env, Hook); diff --git a/src/rebar_plugins.erl b/src/rebar_plugins.erl index 01fe118..7e12324 100644 --- a/src/rebar_plugins.erl +++ b/src/rebar_plugins.erl @@ -93,9 +93,7 @@ handle_plugin(Profile, Plugin, State, Upgrade) -> build_plugin(AppInfo, Apps, State) -> Providers = rebar_state:providers(State), Providers1 = rebar_state:providers(rebar_app_info:state(AppInfo)), - AppDir = rebar_app_info:dir(AppInfo), - C = rebar_config:consult(AppDir), - S = rebar_state:new(rebar_state:all_deps(rebar_state:new(), Apps), C, AppDir), + S = rebar_state:all_deps(rebar_app_info:state_or_new(State, AppInfo), Apps), rebar_prv_compile:compile(S, Providers++Providers1, AppInfo). plugin_providers({Plugin, _, _, _}) when is_atom(Plugin) -> |