From 1271458c511100a5402a7aec94e48904ad792ac7 Mon Sep 17 00:00:00 2001 From: Pierre Fenoll Date: Sun, 25 Feb 2018 13:39:45 +0100 Subject: sort-as: a more general pattern --- src/rebar_state.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rebar_state.erl b/src/rebar_state.erl index ac77325..dd1f43f 100644 --- a/src/rebar_state.erl +++ b/src/rebar_state.erl @@ -257,14 +257,14 @@ 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) -> - IsTesting = lists:member(test, CurrentProfiles), + ProvidedProfiles = lists:prefix([default|Profiles], CurrentProfiles), 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; - [test] when IsTesting -> + _ when ProvidedProfiles -> deduplicate(CurrentProfiles); _ -> deduplicate(CurrentProfiles ++ Profiles) -- cgit v1.1