From 0afb4c4d477b1c1fba54ad3ef086d0697a5faeaa Mon Sep 17 00:00:00 2001
From: Alexander Sedov <asedov@platbox.com>
Date: Tue, 11 Oct 2016 10:36:12 +0300
Subject: Made reading sys.configs consistent with OTP specification.

---
 src/rebar_file_utils.erl | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/rebar_file_utils.erl')

diff --git a/src/rebar_file_utils.erl b/src/rebar_file_utils.erl
index 437780d..28cc516 100644
--- a/src/rebar_file_utils.erl
+++ b/src/rebar_file_utils.erl
@@ -72,11 +72,14 @@ consult_config(State, Filename) ->
         [T] -> T;
         [] -> []
     end,
-    SubConfigs = [consult_config(State, Entry ++ ".config") ||
-                  Entry <- Config, is_list(Entry)
-                 ],
-
-    [Config | lists:merge(SubConfigs)].
+    lists:flatmap(
+      fun (SubConfig) when is_list(SubConfig) ->
+        case consult_config(State, SubConfig) of
+          [] -> consult_config(State, SubConfig ++ ".config");
+          X -> X
+        end;
+          (Entry) -> [Entry]
+      end, Config).
 
 format_error({bad_term_file, AppFile, Reason}) ->
     io_lib:format("Error reading file ~s: ~s", [AppFile, file:format_error(Reason)]).
-- 
cgit v1.1