From 30d1cdb31bbcc573cf3f31e67fdf0c1140b731fc Mon Sep 17 00:00:00 2001
From: Tim Watson <watson.timothy@gmail.com>
Date: Tue, 6 Sep 2011 09:51:38 +0100
Subject: [PATCH] Fix config handling in root_dir

Avoid overwriting custom config (passed with -C) when we are processing
the base_dir in rebar_core.
---
 inttest/t_custom_config/custom.config          |  4 ++++
 inttest/t_custom_config/t_custom_config_rt.erl | 11 +++++++++--
 src/rebar_core.erl                             | 13 ++++++++++++-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/inttest/t_custom_config/custom.config b/inttest/t_custom_config/custom.config
index 6e6cd92..8c60b5e 100644
--- a/inttest/t_custom_config/custom.config
+++ b/inttest/t_custom_config/custom.config
@@ -1 +1,5 @@
+
+{deps, [
+    {boo, "."}
+]}.
 {erl_opts, [warnings_as_errors]}.
diff --git a/inttest/t_custom_config/t_custom_config_rt.erl b/inttest/t_custom_config/t_custom_config_rt.erl
index 8a4e2ab..d333b11 100644
--- a/inttest/t_custom_config/t_custom_config_rt.erl
+++ b/inttest/t_custom_config/t_custom_config_rt.erl
@@ -5,17 +5,24 @@
 -include_lib("eunit/include/eunit.hrl").
 
 files() ->
-    [{copy, "custom.config", "custom.config"},
+    [{copy, "../../rebar", "rebar"},
+     {copy, "custom.config", "custom.config"},
      {create, "ebin/custom_config.app", app(custom_config, [custom_config])}].
 
 run(Dir) ->
     retest_log:log(debug, "Running in Dir: ~s~n", [Dir]),
-    Ref = retest:sh("rebar -C custom.config check-deps -v", [{async, true}]),
+    Ref = retest:sh("./rebar -C custom.config check-deps -v", [{async, true}]),
     {ok, Captured} =
         retest:sh_expect(Ref,
                          "DEBUG: Consult config file .*/custom.config.*",
                          [{capture, all, list}]),
+    {ok, Missing} =
+        retest:sh_expect(Ref,
+                     "DEBUG: Missing deps  : \\[\\{dep,bad_name,"
+                     "boo,\"\\.\",undefined\\}\\]",
+                     [{capture, all, list}]),
     retest_log:log(debug, "[CAPTURED]: ~s~n", [Captured]),
+    retest_log:log(debug, "[Missing]: ~s~n", [Missing]),
     ok.
 
 %%
diff --git a/src/rebar_core.erl b/src/rebar_core.erl
index 5030f06..832bb32 100644
--- a/src/rebar_core.erl
+++ b/src/rebar_core.erl
@@ -102,7 +102,7 @@ process_dir(Dir, ParentConfig, Command, DirSet) ->
         true ->
             ?DEBUG("Entering ~s\n", [Dir]),
             ok = file:set_cwd(Dir),
-            Config = rebar_config:new(ParentConfig),
+            Config = maybe_load_local_config(Dir, ParentConfig),
 
             %% Save the current code path and then update it with
             %% lib_dirs. Children inherit parents code path, but we
@@ -184,7 +184,18 @@ process_dir(Dir, ParentConfig, Command, DirSet) ->
             DirSet4
     end.
 
+maybe_load_local_config(Dir, ParentConfig) ->
+    %% We need to ensure we don't overwrite custom
+    %% config when we are dealing with base_dir.
+    case processing_base_dir(Dir) of
+        true ->
+            ParentConfig;
+        false ->
+            rebar_config:new(ParentConfig)
+    end.
 
+processing_base_dir(Dir) ->
+    Dir == rebar_config:get_global(base_dir, undefined).
 
 %%
 %% Given a list of directories and a set of previously processed directories,