diff options
| author | Viacheslav V. Kovalev <kovyl2404@gmail.com> | 2015-05-01 00:23:51 +0300 |
|---|---|---|
| committer | Viacheslav V. Kovalev <kovyl2404@gmail.com> | 2015-05-01 00:23:51 +0300 |
| commit | 33736f32a9a8bfd30711270e8f1376280915d697 (patch) | |
| tree | 11924915352287650253a73ae7254af241c07625 /src/rebar3.erl | |
| parent | 29a855d31c7fe7fd7504f5d0ec95c9a55e27276f (diff) | |
| parent | 7645a1118f0e5cdc27e010905f5072021559ddfd (diff) | |
Merge branch 'master' into app-discover-profile-duplication
Conflicts:
test/rebar_profiles_SUITE.erl
Diffstat (limited to 'src/rebar3.erl')
| -rw-r--r-- | src/rebar3.erl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/rebar3.erl b/src/rebar3.erl index 460bc36..b0cc949 100644 --- a/src/rebar3.erl +++ b/src/rebar3.erl @@ -27,6 +27,7 @@ -module(rebar3). -export([main/1, + run/1, run/2, global_option_spec_list/0, init_config/0, @@ -114,6 +115,8 @@ run_aux(State, RawArgs) -> State2 = case os:getenv("REBAR_PROFILE") of false -> State; + "" -> + State; Profile -> rebar_state:apply_profiles(State, [list_to_atom(Profile)]) end, @@ -134,7 +137,9 @@ run_aux(State, RawArgs) -> {Task, Args} = parse_args(RawArgs), - rebar_core:init_command(rebar_state:command_args(State7, Args), Task). + State8 = rebar_state:code_paths(State7, default, code:get_path()), + + rebar_core:init_command(rebar_state:command_args(State8, Args), Task). init_config() -> %% Initialize logging system |