diff options
| author | Tristan Sloughter <t@crashfast.com> | 2016-02-21 09:47:31 -0600 |
|---|---|---|
| committer | Tristan Sloughter <t@crashfast.com> | 2016-02-21 09:47:31 -0600 |
| commit | 862486cac743174b6a3a2ffb487dc851ea97020a (patch) | |
| tree | ae01a72905fbfa81fa8fd0c4ac5bbbf4f717698c /src/rebar_state.erl | |
| parent | e3437c1dfbb170fe07793004738c29963b887466 (diff) | |
| parent | caf4468f3bbbea75be35e0cf0560990b5db66e7e (diff) | |
Merge pull request #1061 from ferd/future-proof-lockfiles
Make lock files future-proof
Diffstat (limited to 'src/rebar_state.erl')
| -rw-r--r-- | src/rebar_state.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rebar_state.erl b/src/rebar_state.erl index 0c07b2a..5ec2aef 100644 --- a/src/rebar_state.erl +++ b/src/rebar_state.erl @@ -115,13 +115,13 @@ new(ParentState, Config, Deps, Dir) -> deps_from_config(Dir, Config) -> case rebar_config:consult_lock_file(filename:join(Dir, ?LOCK_FILE)) of - [D] -> + [] -> + [{{deps, default}, proplists:get_value(deps, Config, [])}]; + 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}]; - _ -> - [{{deps, default}, proplists:get_value(deps, Config, [])}] + [{{locks, default}, D}, {{deps, default}, Deps}] end. base_state() -> |