Parcourir la source

don't use lock file for non-defualt profile deps

pull/46/head
Tristan Sloughter il y a 10 ans
Parent
révision
63461b45b5
2 fichiers modifiés avec 8 ajouts et 9 suppressions
  1. +7
    -6
      src/rebar_prv_install_deps.erl
  2. +1
    -3
      src/rebar_state.erl

+ 7
- 6
src/rebar_prv_install_deps.erl Voir le fichier

@ -65,15 +65,16 @@ init(State) ->
-spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}. -spec do(rebar_state:t()) -> {ok, rebar_state:t()} | {error, string()}.
do(State) -> do(State) ->
?INFO("Verifying dependencies...", []),
Profile = rebar_state:current_profile(State), Profile = rebar_state:current_profile(State),
?INFO("Verifying ~p dependencies...", [Profile]),
ProjectApps = rebar_state:project_apps(State), ProjectApps = rebar_state:project_apps(State),
try try
{ok, SrcApps, State1} = case rebar_state:get(State, locks, []) of
[] ->
handle_deps(State, rebar_state:get(State, {deps, Profile}, []));
Locks ->
handle_deps(State, Locks)
{ok, SrcApps, State1} = case {Profile, rebar_state:get(State, locks, [])} of
{default, Locks} ->
handle_deps(State, Locks);
_ ->
%% If not the default profile, ignore locks file
handle_deps(State, rebar_state:get(State, {deps, Profile}, []))
end, end,
Source = ProjectApps ++ SrcApps, Source = ProjectApps ++ SrcApps,

+ 1
- 3
src/rebar_state.erl Voir le fichier

@ -160,8 +160,6 @@ apply_profile(State=#state_t{default=Opts}, Profile) ->
State#state_t{opts=merge_opts(Profile, ProfileOpts, Opts1)}. State#state_t{opts=merge_opts(Profile, ProfileOpts, Opts1)}.
merge_opts(Profile, NewOpts, OldOpts) -> merge_opts(Profile, NewOpts, OldOpts) ->
io:format("Keys ~p~n", [dict:fetch_keys(NewOpts)]),
io:format("Keys ~p~n", [dict:fetch_keys(OldOpts)]),
Dict = dict:merge(fun(_Key, NewValue, OldValue) when is_list(NewValue) -> Dict = dict:merge(fun(_Key, NewValue, OldValue) when is_list(NewValue) ->
case io_lib:printable_list(NewValue) of case io_lib:printable_list(NewValue) of
true -> true ->
@ -177,7 +175,7 @@ merge_opts(Profile, NewOpts, OldOpts) ->
case dict:find(deps, NewOpts) of case dict:find(deps, NewOpts) of
error -> error ->
dict:store({deps, Profile}, [], Dict); dict:store({deps, Profile}, [], Dict);
Deps ->
{ok, Deps} ->
dict:store({deps, Profile}, Deps, Dict) dict:store({deps, Profile}, Deps, Dict)
end. end.

Chargement…
Annuler
Enregistrer