diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2016-02-21 14:18:12 -0500 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2016-02-21 14:18:12 -0500 |
| commit | ada08b88d7ce1112633ebc397719e9f35d0de2a9 (patch) | |
| tree | 090c7341fdb6a61568ee75231b3e93bf3dacf08d /src/rebar_state.erl | |
| parent | 862486cac743174b6a3a2ffb487dc851ea97020a (diff) | |
| parent | 53866e148cb98086f6b44c45e570b7f9150bc096 (diff) | |
Merge pull request #1065 from tsloughter/plugin_precedence
give top level plugin providers precedence over default providers
Diffstat (limited to 'src/rebar_state.erl')
| -rw-r--r-- | src/rebar_state.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rebar_state.erl b/src/rebar_state.erl index 5ec2aef..5a994aa 100644 --- a/src/rebar_state.erl +++ b/src/rebar_state.erl @@ -103,7 +103,8 @@ new(ParentState, Config, Dir) -> new(ParentState, Config, Deps, Dir) -> Opts = ParentState#state_t.opts, Plugins = proplists:get_value(plugins, Config, []), - Terms = Deps++[{{plugins, default}, Plugins} | Config], + ProjectPlugins = proplists:get_value(project_plugins, Config, []), + Terms = Deps++[{{project_plugins, default}, ProjectPlugins}, {{plugins, default}, Plugins} | Config], true = rebar_config:verify_config_format(Terms), LocalOpts = dict:from_list(Terms), @@ -136,7 +137,8 @@ base_state() -> base_opts(Config) -> Deps = proplists:get_value(deps, Config, []), Plugins = proplists:get_value(plugins, Config, []), - Terms = [{{deps, default}, Deps}, {{plugins, default}, Plugins} | Config], + ProjectPlugins = proplists:get_value(project_plugins, Config, []), + Terms = [{{deps, default}, Deps}, {{plugins, default}, Plugins}, {{project_plugins, default}, ProjectPlugins} | Config], true = rebar_config:verify_config_format(Terms), dict:from_list(Terms). |