summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFred Hebert <mononcqc@ferd.ca>2015-05-30 02:48:59 +0000
committerFred Hebert <mononcqc@ferd.ca>2015-05-30 02:48:59 +0000
commit30847ec66103bdbaa8b7787577677c24d583500f (patch)
tree87261ea9792e569ecf28bbc804e4b44c54e01f5a /src
parent398204b13e9b9073e14ce7311be6e54eb1eb956b (diff)
Fix config loading in shell
Config files from the command line would expect the wrong format: {app1, [...]}. {app2, [...]}. Instead of the correct sys.config format: [{app1, [...]}, {app2, [...]}] Not supported yet: the recursive file references documented in http://www.erlang.org/doc/man/config.html
Diffstat (limited to 'src')
-rw-r--r--src/rebar_prv_shell.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rebar_prv_shell.erl b/src/rebar_prv_shell.erl
index 74e2386..5110f52 100644
--- a/src/rebar_prv_shell.erl
+++ b/src/rebar_prv_shell.erl
@@ -237,4 +237,7 @@ find_config_relx(State) ->
consult_config(State, Filename) ->
Fullpath = filename:join(rebar_dir:root_dir(State), Filename),
?DEBUG("Loading configuration from ~p", [Fullpath]),
- rebar_file_utils:try_consult(Fullpath).
+ case rebar_file_utils:try_consult(Fullpath) of
+ [T] -> T;
+ [] -> []
+ end.