Merge pull request #609 from tsloughter/global_plugin_bug

Global plugin bug

2 files changed, 22 insertions, 3 deletions

diff --git a/bootstrap b/bootstrap
index 71c44da..e35445c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -61,8 +61,12 @@ main(_Args) ->
     end.
 
 fetch_and_compile({Name, ErlFirstFiles}, Deps) ->
-    {Name, _, Repo} = lists:keyfind(Name, 1, Deps),
-    ok = fetch(Repo, Name),
+    case lists:keyfind(Name, 1, Deps) of
+        {Name, Vsn} ->
+            ok = fetch({pkg, atom_to_binary(Name, utf8), list_to_binary(Vsn)}, Name);
+        {Name, _, Source} ->
+            ok = fetch(Source, Name)
+    end,
     compile(Name, ErlFirstFiles).
 
 fetch({pkg, Name, Vsn}, App) ->
@@ -279,6 +283,12 @@ write_windows_scripts() ->
 
 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);
         {ok, [Deps]} ->
             [{binary_to_atom(Name, utf8), "", Source} || {Name, Source, _Level} <- Deps];
         _ ->
diff --git a/src/rebar_state.erl b/src/rebar_state.erl
index d0b28de..1e0abc5 100644
--- a/src/rebar_state.erl
+++ b/src/rebar_state.erl
@@ -289,7 +289,16 @@ 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
+                          %% 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;
+                          _ ->
+                              deduplicate(CurrentProfiles ++ Profiles)
+                      end,
+
     ConfigProfiles = rebar_state:get(State, profiles, []),
 
     NewOpts =