From 8168c1f4f99d4709d273a9a35d6e2105043fb098 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Thu, 1 Jan 2015 08:50:46 -0600 Subject: overrides working with lock except in case of adding to config after lock --- src/rebar3.erl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/rebar3.erl') diff --git a/src/rebar3.erl b/src/rebar3.erl index f69d27f..db393b0 100644 --- a/src/rebar3.erl +++ b/src/rebar3.erl @@ -142,7 +142,8 @@ init_config() -> Config1 = case rebar_config:consult_file(?LOCK_FILE) of [D] -> - [{locks, D}, {{deps, default}, D} | Config]; + % {{deps, default}, D} + [{{locks, default}, D} | Config]; _ -> Config end, -- cgit v1.1 From 872e741972b72503050bb83032c063a0eb9d01c8 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Fri, 2 Jan 2015 09:21:57 -0600 Subject: use level in lock file so changes to config don't change outcome of run --- src/rebar3.erl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/rebar3.erl') diff --git a/src/rebar3.erl b/src/rebar3.erl index db393b0..f95f902 100644 --- a/src/rebar3.erl +++ b/src/rebar3.erl @@ -143,7 +143,8 @@ init_config() -> Config1 = case rebar_config:consult_file(?LOCK_FILE) of [D] -> % {{deps, default}, D} - [{{locks, default}, D} | Config]; + Deps = [X || X <- D, element(4, X) =:= 0], + [{{locks, default}, D}, {{deps, default}, Deps} | Config]; _ -> Config end, -- cgit v1.1 From 37a20259062056f684f3fa7e9333ca7de9f97a4d Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sun, 4 Jan 2015 10:44:00 -0600 Subject: don't allow locked transitive dep to override higher level dep --- src/rebar3.erl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/rebar3.erl') diff --git a/src/rebar3.erl b/src/rebar3.erl index f95f902..c062aa4 100644 --- a/src/rebar3.erl +++ b/src/rebar3.erl @@ -142,8 +142,9 @@ init_config() -> Config1 = case rebar_config:consult_file(?LOCK_FILE) of [D] -> - % {{deps, default}, D} - Deps = [X || X <- D, element(4, X) =:= 0], + %% 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 -- cgit v1.1