From b49189869067401c9da92a22f0a2343b7a2a2456 Mon Sep 17 00:00:00 2001
From: Dave Smith <dizzyd@dizzyd.com>
Date: Fri, 4 Dec 2009 13:48:57 -0700
Subject: Refactor rebar to build a self-contained script

---
 src/rebar_app_utils.erl | 4 ++--
 src/rebar_core.erl      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/rebar_app_utils.erl b/src/rebar_app_utils.erl
index 900fff0..f879537 100644
--- a/src/rebar_app_utils.erl
+++ b/src/rebar_app_utils.erl
@@ -51,8 +51,8 @@ load_app_file(Filename) ->
             {ok, AppName, AppData};
         {error, Reason} ->
             ?ERROR("Failed to load app file from ~s: ~p\n", [Filename, Reason]),
-            error;
+            ?FAIL;
         Other ->
             ?ERROR("Unexpected terms from app file ~s: ~p\n", [Filename, Other]),
-            error
+            ?FAIL
     end.
diff --git a/src/rebar_core.erl b/src/rebar_core.erl
index 5b9c8c7..7a40200 100644
--- a/src/rebar_core.erl
+++ b/src/rebar_core.erl
@@ -38,7 +38,7 @@ run(Args) ->
     Commands = filter_flags(Args, []),
     
     %% Pre-load the rebar app so that we get default configuration
-    application:load(rebar),
+    ok = application:load(rebar),
 
     %% Initialize logging system
     rebar_log:init(),
-- 
cgit v1.1