diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2017-09-01 16:39:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-01 16:39:02 -0400 |
| commit | 46a082afec58d8081a3a896a7f64b9cbfb71a19c (patch) | |
| tree | a6ddee89a1c8b41903123d79d8cb3d11644eaf57 /src | |
| parent | 03f6f634f03de894c2322e9df3b2b3b36d102a4f (diff) | |
| parent | 8e4f90fa08bb44e041b4225c49d5a75124adcb3c (diff) | |
Merge pull request #1625 from tsloughter/ct-sys-config-merging
fix sys config merging
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_file_utils.erl | 5 |
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), |