summaryrefslogtreecommitdiff
path: root/src/rebar3.erl
diff options
context:
space:
mode:
authorTristan Sloughter <t@crashfast.com>2014-12-07 18:39:26 -0600
committerTristan Sloughter <t@crashfast.com>2014-12-16 10:01:36 -0600
commit3219a666f448b882c7534e200295be09ae6434fd (patch)
tree57b7d07b32e2e07fde09937118e84b465ab30672 /src/rebar3.erl
parent0672fc45b797b9a496e5bf7797d2b7168f16ca42 (diff)
rewrite profiles
Diffstat (limited to 'src/rebar3.erl')
-rw-r--r--src/rebar3.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rebar3.erl b/src/rebar3.erl
index f6a2b78..368ba68 100644
--- a/src/rebar3.erl
+++ b/src/rebar3.erl
@@ -106,11 +106,11 @@ run_aux(State, GlobalPluginProviders, RawArgs) ->
application:start(ssl),
inets:start(),
- State2 = case os:getenv("REBAR_DEFAULT_PROFILE") of
+ State2 = case os:getenv("REBAR_PROFILE") of
false ->
- rebar_state:current_profile(State, default);
+ State;
Profile ->
- State1 = rebar_state:current_profile(State, list_to_atom(Profile)),
+ State1 = rebar_state:apply_profiles(State, [list_to_atom(Profile)]),
rebar_state:default(State1, rebar_state:opts(State1))
end,
@@ -143,7 +143,7 @@ init_config() ->
Config1 = case rebar_config:consult_file(?LOCK_FILE) of
[D] ->
- [{locks, D} | Config];
+ [{locks, D}, {{deps, default}, D} | Config];
_ ->
Config
end,