summaryrefslogtreecommitdiff
path: root/src/rebar_file_utils.erl
diff options
context:
space:
mode:
authorTristan Sloughter <t@crashfast.com>2017-09-01 12:21:25 -0700
committerTristan Sloughter <t@crashfast.com>2017-09-01 12:21:25 -0700
commit8e4f90fa08bb44e041b4225c49d5a75124adcb3c (patch)
treed4c2638c18ac1bf18d1bc6133009310d63db49d0 /src/rebar_file_utils.erl
parentaf3d3b73c0676f061c7c26a628059f48213f135d (diff)
fix sys config merging
Diffstat (limited to 'src/rebar_file_utils.erl')
-rw-r--r--src/rebar_file_utils.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rebar_file_utils.erl b/src/rebar_file_utils.erl
index c860513..4a783f2 100644
--- a/src/rebar_file_utils.erl
+++ b/src/rebar_file_utils.erl
@@ -75,8 +75,9 @@ consult_config(State, Filename) ->
JoinedConfig = lists:flatmap(
fun (SubConfig) when is_list(SubConfig) ->
case lists:suffix(".config", SubConfig) of
- false -> consult_config(State, SubConfig ++ ".config");
- true -> consult_config(State, SubConfig)
+ %% since consult_config returns a list in a list we take the head here
+ false -> hd(consult_config(State, SubConfig ++ ".config"));
+ true -> hd(consult_config(State, SubConfig))
end;
(Entry) -> [Entry]
end, Config),