From 6fb418824358cb47ba73b2d9a951888dbd625bc0 Mon Sep 17 00:00:00 2001 From: Matt Rudder Date: Thu, 6 Mar 2014 10:02:56 -0800 Subject: Added a command line override for the sys_config setting. --- src/rlx_prv_config.erl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/rlx_prv_config.erl') diff --git a/src/rlx_prv_config.erl b/src/rlx_prv_config.erl index 0379c2f..da620be 100644 --- a/src/rlx_prv_config.erl +++ b/src/rlx_prv_config.erl @@ -188,7 +188,12 @@ load_terms({release, {RelName, Vsn}, {erts, ErtsVsn}, load_terms({vm_args, VmArgs}, {ok, State}) -> {ok, rlx_state:vm_args(State, filename:absname(VmArgs))}; load_terms({sys_config, SysConfig}, {ok, State}) -> - {ok, rlx_state:sys_config(State, filename:absname(SysConfig))}; + case rlx_state:sys_config(State) of + undefined -> + {ok, rlx_state:sys_config(State, filename:absname(SysConfig))}; + _ -> + {ok, State} + end; load_terms({output_dir, OutputDir}, {ok, State}) -> {ok, rlx_state:output_dir(State, filename:absname(OutputDir))}; load_terms({overlay_vars, OverlayVars}, {ok, State}) -> -- cgit v1.2.3