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 ++- src/rebar_prv_install_deps.erl | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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, diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl index 5e5e619..a5ef6aa 100644 --- a/src/rebar_prv_install_deps.erl +++ b/src/rebar_prv_install_deps.erl @@ -407,7 +407,7 @@ parse_dep({Name, _Vsn, Source}, {SrcDepsAcc, PkgDepsAcc}, DepsDir, State) when i Dep = new_dep(DepsDir, Name, [], Source, State), {[Dep | SrcDepsAcc], PkgDepsAcc}; parse_dep({Name, Source, Level}, {SrcDepsAcc, PkgDepsAcc}, DepsDir, State) when is_tuple (Source) - , is_integer(Level) -> + , is_integer(Level) -> Dep = new_dep(DepsDir, Name, [], Source, State), {[Dep | SrcDepsAcc], PkgDepsAcc}. -- cgit v1.1