diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2015-02-19 11:08:51 -0500 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2015-02-19 11:08:51 -0500 |
| commit | be6cacfe599702cf2c93b31fb2e38d5b456ee0fd (patch) | |
| tree | 38b8fccdba595258923ef7ccb244c3a4bee8f85d /src/rebar3.erl | |
| parent | f93a70905f4eebbcb9dbb0ac62464581a245c6e5 (diff) | |
| parent | 02e33a265bff8c76ebc6f1ddfc0f8fa8515874aa (diff) | |
Merge pull request #155 from tsloughter/new_deps
check for newly added deps in the config file that aren't level 0 in lock
Diffstat (limited to 'src/rebar3.erl')
| -rw-r--r-- | src/rebar3.erl | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/rebar3.erl b/src/rebar3.erl index 268be68..03b7b98 100644 --- a/src/rebar3.erl +++ b/src/rebar3.erl @@ -142,15 +142,7 @@ init_config() -> rebar_config:consult_file(ConfigFile) end, - Config1 = case rebar_config:consult_file(?LOCK_FILE) of - [D] -> - %% We want the top level deps only from the lock file. - %% This ensures deterministic overrides for configs. - Deps = [X || X <- D, element(3, X) =:= 0], - [{{locks, default}, D}, {{deps, default}, Deps} | Config]; - _ -> - Config - end, + Config1 = rebar_config:merge_locks(Config, rebar_config:consult_file(?LOCK_FILE)), %% If $HOME/.rebar3/config exists load and use as global config Home = rebar_dir:home_dir(), @@ -229,8 +221,6 @@ version() -> ?CONSOLE("rebar ~s on Erlang/OTP ~s Erts ~s", [Vsn, erlang:system_info(otp_release), erlang:system_info(version)]). - - %% TODO: Actually make it 'global' %% %% set global flag based on getopt option boolean value |