From a06a2f8917a9075bdd150d692a85dd65f211a51d Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sat, 11 Jul 2015 12:42:38 -0500 Subject: handle global plugins installing plugins to build deps --- src/rebar_state.erl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/rebar_state.erl b/src/rebar_state.erl index d0b28de..4b8a282 100644 --- a/src/rebar_state.erl +++ b/src/rebar_state.erl @@ -289,7 +289,13 @@ apply_profiles(State, Profile) when not is_list(Profile) -> apply_profiles(State, [default]) -> State; apply_profiles(State=#state_t{default = Defaults, current_profiles=CurrentProfiles}, Profiles) -> - AppliedProfiles = deduplicate(CurrentProfiles ++ Profiles), + AppliedProfiles = case Profiles of + [global | _] -> + Profiles; + _ -> + deduplicate(CurrentProfiles ++ Profiles) + end, + ConfigProfiles = rebar_state:get(State, profiles, []), NewOpts = -- cgit v1.1 From a67ce27ac17234aae720ec159ef6eb733a30f716 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sat, 11 Jul 2015 16:14:49 -0500 Subject: add comment for global apply_profiles and log message for bad bootstrap lock file --- src/rebar_state.erl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') diff --git a/src/rebar_state.erl b/src/rebar_state.erl index 4b8a282..1e0abc5 100644 --- a/src/rebar_state.erl +++ b/src/rebar_state.erl @@ -290,6 +290,9 @@ apply_profiles(State, [default]) -> State; apply_profiles(State=#state_t{default = Defaults, current_profiles=CurrentProfiles}, Profiles) -> AppliedProfiles = case Profiles of + %% Head of list global profile is special, only for use by rebar3 + %% It does not clash if a user does `rebar3 as global...` but when + %% it is the head we must make sure not to prepend `default` [global | _] -> Profiles; _ -> -- cgit v1.1