diff options
| author | Dave Smith <dizzyd@dizzyd.com> | 2012-06-04 10:48:00 -0600 |
|---|---|---|
| committer | Dave Smith <dizzyd@dizzyd.com> | 2012-06-08 07:06:15 -0600 |
| commit | ebdb25c5cce48e0eb0efcc27d27e5f16c6a5e3ad (patch) | |
| tree | f890cfc1b5be040b216cb2139699385f7f046361 /src | |
| parent | c86c99940d06f2c77e449b37ab261d8163486e94 (diff) | |
Use delayed_halt everywhere
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar.erl | 8 | ||||
| -rw-r--r-- | src/rebar_utils.erl | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/rebar.erl b/src/rebar.erl index 4c1d20d..f2ddeed 100644 --- a/src/rebar.erl +++ b/src/rebar.erl @@ -54,12 +54,12 @@ main(Args) -> ok -> ok; {error, failed} -> - halt(1); + rebar_utils:delayed_halt(1); Error -> %% Nothing should percolate up from rebar_core; %% Dump this error to console io:format("Uncaught error in rebar_core: ~p\n", [Error]), - halt(1) + rebar_utils:delayed_halt(1) end. %% ==================================================================== @@ -186,7 +186,7 @@ parse_args(Args) -> {error, {Reason, Data}} -> ?ERROR("~s ~p~n~n", [Reason, Data]), help(), - halt(1) + rebar_utils:delayed_halt(1) end. %% @@ -233,7 +233,7 @@ show_info_maybe_halt(Opts, NonOptArgs) -> [] -> ?CONSOLE("No command to run specified!~n",[]), help(), - halt(1); + rebar_utils:delayed_halt(1); _ -> ok end. diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl index 70af4f2..8f71bab 100644 --- a/src/rebar_utils.erl +++ b/src/rebar_utils.erl @@ -139,7 +139,7 @@ ensure_dir(Path) -> -spec abort() -> no_return(). abort() -> - delayed_halt(1). + throw(rebar_abort). -spec abort(string(), [term()]) -> no_return(). abort(String, Args) -> |