aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJordan Wilberding <[email protected]>2013-10-21 07:24:06 -0700
committerJordan Wilberding <[email protected]>2013-10-21 07:24:06 -0700
commit58382fb7aa3eeb923383bd83373f792b5bff2cec (patch)
tree8fd0ed91b9ca817c5aae4d035e0d4273521c9564 /src
parent794242f1314aaa8b06c9c9a87669d0560e3b4b84 (diff)
parent071f8f0fd365609cbe73afcf51bb896c13aaba9c (diff)
downloadrelx-58382fb7aa3eeb923383bd83373f792b5bff2cec.tar.gz
relx-58382fb7aa3eeb923383bd83373f792b5bff2cec.tar.bz2
relx-58382fb7aa3eeb923383bd83373f792b5bff2cec.zip
Merge pull request #80 from loucash/masterv0.5.1
patch for exception: no match of right hand side value
Diffstat (limited to 'src')
-rw-r--r--src/rlx_prv_config.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rlx_prv_config.erl b/src/rlx_prv_config.erl
index e2eac7e..19aa576 100644
--- a/src/rlx_prv_config.erl
+++ b/src/rlx_prv_config.erl
@@ -191,9 +191,9 @@ 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 = list_of_overlay_vars_files(OverlayVars),
- NewOverlayVars = lists:umerge(lists:usort(NewOverlayVars), lists:usort(CurrentOverlayVars)),
- {ok, rlx_state:put(State, overlay_vars, NewOverlayVars)};
+ NewOverlayVars0 = list_of_overlay_vars_files(OverlayVars),
+ NewOverlayVars1 = lists:umerge(lists:usort(NewOverlayVars0), lists:usort(CurrentOverlayVars)),
+ {ok, rlx_state:put(State, overlay_vars, NewOverlayVars1)};
load_terms({Name, Value}, {ok, State})
when erlang:is_atom(Name) ->
{ok, rlx_state:put(State, Name, Value)};