diff options
| author | Viacheslav V. Kovalev <kovyl2404@gmail.com> | 2015-05-01 00:23:51 +0300 |
|---|---|---|
| committer | Viacheslav V. Kovalev <kovyl2404@gmail.com> | 2015-05-01 00:23:51 +0300 |
| commit | 33736f32a9a8bfd30711270e8f1376280915d697 (patch) | |
| tree | 11924915352287650253a73ae7254af241c07625 /src/rebar_config.erl | |
| parent | 29a855d31c7fe7fd7504f5d0ec95c9a55e27276f (diff) | |
| parent | 7645a1118f0e5cdc27e010905f5072021559ddfd (diff) | |
Merge branch 'master' into app-discover-profile-duplication
Conflicts:
test/rebar_profiles_SUITE.erl
Diffstat (limited to 'src/rebar_config.erl')
| -rw-r--r-- | src/rebar_config.erl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/rebar_config.erl b/src/rebar_config.erl index 76e03ea..c858fef 100644 --- a/src/rebar_config.erl +++ b/src/rebar_config.erl @@ -57,7 +57,6 @@ consult_file(File) -> {ok, Terms} = consult_and_eval(File, Script), Terms; false -> - ?DEBUG("Consult config file ~p", [File]), try_consult(File) end end. @@ -70,7 +69,7 @@ merge_locks(Config, [[]]) -> Config; %% lockfile with entries merge_locks(Config, [Locks]) -> - {deps, ConfigDeps} = lists:keyfind(deps, 1, Config), + ConfigDeps = proplists:get_value(deps, Config, []), %% We want the top level deps only from the lock file. %% This ensures deterministic overrides for configs. %% Then check if any new deps have been added to the config |