From ebb713449e377f88c8c04e91a8a8257fdc0c21bd Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sun, 25 Jan 2015 08:59:17 -0600 Subject: check locks before locking a dep to not have duplicates --- src/rebar_prv_install_deps.erl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src') 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; -- cgit v1.1