diff options
Diffstat (limited to 'src/rebar_prv_upgrade.erl')
| -rw-r--r-- | src/rebar_prv_upgrade.erl | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/rebar_prv_upgrade.erl b/src/rebar_prv_upgrade.erl index 49d5674..46aed9e 100644 --- a/src/rebar_prv_upgrade.erl +++ b/src/rebar_prv_upgrade.erl @@ -94,21 +94,16 @@ prepare_locks([Name|Names], Deps, Locks, Unlocks) -> AtomName = binary_to_atom(Name, utf8), case lists:keyfind(Name, 1, Locks) of {_, _, 0} = Lock -> - case {lists:keyfind(AtomName, 1, Deps), lists:member(AtomName, Deps)} of - {false, false} -> + case rebar_utils:tup_find(AtomName, Deps) of + false -> ?PRV_ERROR({unknown_dependency, Name}); - {Dep, false} -> - {Source, NewLocks, NewUnlocks} = prepare_lock(Dep, Lock, Locks), - prepare_locks(Names, Deps, NewLocks, - [{Name, Source, 0} | NewUnlocks ++ Unlocks]); - {false, true} -> % package as a single atom - Dep = AtomName, + Dep -> {Source, NewLocks, NewUnlocks} = prepare_lock(Dep, Lock, Locks), prepare_locks(Names, Deps, NewLocks, [{Name, Source, 0} | NewUnlocks ++ Unlocks]) end; {_, _, Level} = Lock when Level > 0 -> - case lists:keyfind(AtomName, 1, Deps) of + case rebar_utils:tup_find(AtomName, Deps) of false -> ?PRV_ERROR({transitive_dependency, Name}); Dep -> % Dep has been promoted |