diff options
| author | Tristan Sloughter <t@crashfast.com> | 2015-01-02 09:21:57 -0600 |
|---|---|---|
| committer | Tristan Sloughter <t@crashfast.com> | 2015-01-02 09:21:57 -0600 |
| commit | 872e741972b72503050bb83032c063a0eb9d01c8 (patch) | |
| tree | be34e558ee78ea4dfb1ea4bdfa03a93e122aa7a7 | |
| parent | 8168c1f4f99d4709d273a9a35d6e2105043fb098 (diff) | |
use level in lock file so changes to config don't change outcome of run
| -rw-r--r-- | src/rebar3.erl | 3 | ||||
| -rw-r--r-- | 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}. |