aboutsummaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authornosnilmot <stu@nosnilmot.com>2017-11-15 08:21:05 +0000
committerPaweł Chmielowski <prefiks@prefiks.org>2017-11-15 09:21:05 +0100
commit0c6ef98d01a005d139acc8da4720c0fa445bbb7f (patch)
tree22d440444baa883a86babd913f71b5b53e9f4d93 /plugins
parentMakefile.in: Fix "make clean && make" (diff)
Avoid badarg error when running get-deps before ./configure has created src/ejabberd.app (#2103)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/override_opts.erl10
1 files changed, 7 insertions, 3 deletions
diff --git a/plugins/override_opts.erl b/plugins/override_opts.erl
index 1b83fb6a1..1cdeca662 100644
--- a/plugins/override_opts.erl
+++ b/plugins/override_opts.erl
@@ -18,7 +18,8 @@ preprocess(Config, _Dirs) ->
Val -> Val
end,
Config2 = rebar_config:set_xconf(Config, top_overrides, TopOverrides),
- Config3 = case rebar_app_utils:load_app_file(Config2, _Dirs) of
+ try
+ Config3 = case rebar_app_utils:load_app_file(Config2, _Dirs) of
{ok, C, AppName, _AppData} ->
lists:foldl(fun({Type, AppName2, Opts}, Conf1) when
AppName2 == AppName ->
@@ -28,5 +29,8 @@ preprocess(Config, _Dirs) ->
end, C, TopOverrides);
_ ->
Config2
- end,
- {ok, Config3, []}.
+ end,
+ {ok, Config3, []}
+ catch
+ error:badarg -> {ok, Config2, []}
+ end.