summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Sloughter <t@crashfast.com>2015-07-11 16:14:49 -0500
committerTristan Sloughter <t@crashfast.com>2015-07-11 16:15:11 -0500
commita67ce27ac17234aae720ec159ef6eb733a30f716 (patch)
tree0477ee9538bbf47a2b9419bd3c2c5088d4b04665
parenta06a2f8917a9075bdd150d692a85dd65f211a51d (diff)
add comment for global apply_profiles and log message for bad bootstrap lock file
-rwxr-xr-xbootstrap1
-rw-r--r--src/rebar_state.erl3
2 files changed, 4 insertions, 0 deletions
diff --git a/bootstrap b/bootstrap
index 4e85d20..e35445c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -285,6 +285,7 @@ get_deps() ->
case file:consult("rebar.lock") of
{ok, [[]]} ->
%% Something went wrong in a previous build, lock file shouldn't be empty
+ io:format("Empty list in lock file, deleting rebar.lock~n"),
ok = file:delete("rebar.lock"),
{ok, Config} = file:consult("rebar.config"),
proplists:get_value(deps, Config);
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;
_ ->