diff options
author | Jordan Wilberding <[email protected]> | 2014-03-12 10:28:03 +0100 |
---|---|---|
committer | Jordan Wilberding <[email protected]> | 2014-03-12 10:28:03 +0100 |
commit | 52a5b14b232a47d50de992388e64f1f086a96396 (patch) | |
tree | ce807e754bbdb13a1ec558d90799eaee4c34b5d9 /src/rlx_prv_config.erl | |
parent | f2e4ddf2861c3b42205fc6a9e96315cd605031af (diff) | |
parent | 6fb418824358cb47ba73b2d9a951888dbd625bc0 (diff) | |
download | relx-52a5b14b232a47d50de992388e64f1f086a96396.tar.gz relx-52a5b14b232a47d50de992388e64f1f086a96396.tar.bz2 relx-52a5b14b232a47d50de992388e64f1f086a96396.zip |
Merge pull request #133 from mattrudder/sys_config_cmdargs
Added a command line override for the sys_config setting.
Diffstat (limited to 'src/rlx_prv_config.erl')
-rw-r--r-- | src/rlx_prv_config.erl | 7 |
1 files changed, 6 insertions, 1 deletions
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}) -> |