diff options
author | Jordan Wilberding <[email protected]> | 2013-10-12 14:32:01 -0700 |
---|---|---|
committer | Jordan Wilberding <[email protected]> | 2013-10-12 14:32:01 -0700 |
commit | d8fe19483d1afe15017709058f330ac132e4029a (patch) | |
tree | 4ef0d3c0b573b0d0c8459010fc37750c7bb6eba0 /src/rlx_prv_config.erl | |
parent | 7bcf3516d0c8aef9fd7cb0191dd9d36929d2a88d (diff) | |
parent | f50f63f1cb504fc9af4f060b7e7d6c5f1c816d41 (diff) | |
download | relx-d8fe19483d1afe15017709058f330ac132e4029a.tar.gz relx-d8fe19483d1afe15017709058f330ac132e4029a.tar.bz2 relx-d8fe19483d1afe15017709058f330ac132e4029a.zip |
Merge pull request #67 from tsloughter/master
add overlay_vars command line arg
Diffstat (limited to 'src/rlx_prv_config.erl')
-rw-r--r-- | src/rlx_prv_config.erl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/rlx_prv_config.erl b/src/rlx_prv_config.erl index dd11e65..71a2dc9 100644 --- a/src/rlx_prv_config.erl +++ b/src/rlx_prv_config.erl @@ -174,6 +174,10 @@ 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))}; +load_terms({overlay_vars, OverlayVars}, {ok, State}) -> + CurrentOverlayVars = rlx_state:get(State, overlay_vars), + NewOverlayVars = lists:umerge(lists:usort(OverlayVars), lists:usort(CurrentOverlayVars)), + {ok, rlx_state:put(State, overlay_vars, NewOverlayVars)}; load_terms({Name, Value}, {ok, State}) when erlang:is_atom(Name) -> {ok, rlx_state:put(State, Name, Value)}; |