summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTristan Sloughter <t@crashfast.com>2015-01-25 08:59:17 -0600
committerTristan Sloughter <t@crashfast.com>2015-01-25 09:00:09 -0600
commitebb713449e377f88c8c04e91a8a8257fdc0c21bd (patch)
tree35f0689266d57b8c744ccda467b909f52242f26c /src
parent98ae221265887e309d1a3b4bae7b640b4201da61 (diff)
check locks before locking a dep to not have duplicates
Diffstat (limited to 'src')
-rw-r--r--src/rebar_prv_install_deps.erl11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl
index d3eb306..701ee2a 100644
--- a/src/rebar_prv_install_deps.erl
+++ b/src/rebar_prv_install_deps.erl
@@ -205,8 +205,15 @@ maybe_lock(Profile, AppInfo, Seen, State, Level) ->
default ->
case sets:is_element(Name, Seen) of
false ->
- {sets:add_element(Name, Seen),
- rebar_state:lock(State, rebar_app_info:dep_level(AppInfo, Level))};
+ AppName = rebar_app_info:name(AppInfo),
+ Locks = rebar_state:lock(State),
+ case lists:any(fun(App) -> rebar_app_info:name(App) =:= AppName end, Locks) of
+ true ->
+ {sets:add_element(Name, Seen), State};
+ false ->
+ {sets:add_element(Name, Seen),
+ rebar_state:lock(State, rebar_app_info:dep_level(AppInfo, Level))}
+ end;
true ->
{Seen, State}
end;