From a8870807fc6e677b471591ba9313179a5c6c78b6 Mon Sep 17 00:00:00 2001
From: Tuncer Ayaz <tuncer.ayaz@gmail.com>
Date: Fri, 7 Jan 2011 14:58:30 +0100
Subject: Fix code clarity

---
 src/rebar_config.erl | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

(limited to 'src/rebar_config.erl')

diff --git a/src/rebar_config.erl b/src/rebar_config.erl
index cba0e64..7da6900 100644
--- a/src/rebar_config.erl
+++ b/src/rebar_config.erl
@@ -58,20 +58,23 @@ new(ParentConfig) ->
     %% Load terms from rebar.config, if it exists
     Dir = rebar_utils:get_cwd(),
     ConfigFile = filename:join([Dir, ConfName]),
-    case file:consult(ConfigFile) of
-        {ok, Terms} ->
-            %% Found a config file with some terms. We need to be able to
-            %% distinguish between local definitions (i.e. from the file
-            %% in the cwd) and inherited definitions. To accomplish this,
-            %% we use a marker in the proplist (since order matters) between
-            %% the new and old defs.
-            Opts = Terms ++ [local] ++ [Opt || Opt <- ParentConfig#config.opts, Opt /= local];
-        {error, enoent} ->
-            Opts = [local] ++ [Opt || Opt <- ParentConfig#config.opts, Opt /= local];
-        Other ->
-            Opts = undefined, % Keep erlc happy
-            ?ABORT("Failed to load ~s: ~p\n", [ConfigFile, Other])
-    end,
+    Opts = case file:consult(ConfigFile) of
+               {ok, Terms} ->
+                   %% Found a config file with some terms. We need to
+                   %% be able to distinguish between local definitions
+                   %% (i.e. from the file in the cwd) and inherited
+                   %% definitions. To accomplish this, we use a marker
+                   %% in the proplist (since order matters) between
+                   %% the new and old defs.
+                   Terms ++ [local] ++
+                       [Opt || Opt <- ParentConfig#config.opts, Opt /= local];
+               {error, enoent} ->
+                   [local] ++
+                       [Opt || Opt <- ParentConfig#config.opts, Opt /= local];
+               Other ->
+                   ?ABORT("Failed to load ~s: ~p\n", [ConfigFile, Other])
+           end,
+
     #config { dir = Dir, opts = Opts }.
 
 get(Config, Key, Default) ->
@@ -91,7 +94,7 @@ set(Config, Key, Value) ->
     Config#config { opts = [{Key, Value} | Opts] }.
 
 set_global(jobs=Key, Value) when is_list(Value) ->
-    set_global(Key,list_to_integer(Value));
+    set_global(Key, list_to_integer(Value));
 set_global(jobs=Key, Value) when is_integer(Value) ->
     application:set_env(rebar_global, Key, erlang:max(1,Value));
 set_global(Key, Value) ->
-- 
cgit v1.1


From c466076ffb5a1ea4c00d49fefff0dcfbceb58236 Mon Sep 17 00:00:00 2001
From: Tuncer Ayaz <tuncer.ayaz@gmail.com>
Date: Mon, 31 Jan 2011 17:43:31 +0100
Subject: Clean up emacs file local variables

---
 src/rebar_config.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/rebar_config.erl')

diff --git a/src/rebar_config.erl b/src/rebar_config.erl
index 7da6900..a030e2c 100644
--- a/src/rebar_config.erl
+++ b/src/rebar_config.erl
@@ -1,4 +1,4 @@
-%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
+%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
 %% ex: ts=4 sw=4 et
 %% -------------------------------------------------------------------
 %%
-- 
cgit v1.1