diff options
| author | Tristan Sloughter <tristan.sloughter@gmail.com> | 2015-01-04 20:09:07 -0600 |
|---|---|---|
| committer | Tristan Sloughter <tristan.sloughter@gmail.com> | 2015-01-04 20:09:07 -0600 |
| commit | 1d38dcf4feacfb60ae3f9fc54568c23dd28a16a4 (patch) | |
| tree | 44bc967caa387f8f7a96b9de5c39880dccf89521 /src/rebar3.erl | |
| parent | 038fb668e1a7bfb9177f175baa9bcb9c32e95cef (diff) | |
| parent | 37a20259062056f684f3fa7e9333ca7de9f97a4d (diff) | |
Merge pull request #83 from tsloughter/master
overrides working except for transitive dep inheritance with lock file
Diffstat (limited to 'src/rebar3.erl')
| -rw-r--r-- | src/rebar3.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rebar3.erl b/src/rebar3.erl index f69d27f..c062aa4 100644 --- a/src/rebar3.erl +++ b/src/rebar3.erl @@ -142,7 +142,10 @@ init_config() -> Config1 = case rebar_config:consult_file(?LOCK_FILE) of [D] -> - [{locks, D}, {{deps, default}, D} | Config]; + %% 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, |