Skip to content

Commit

Permalink
Merge pull request #80 from loucash/master
Browse files Browse the repository at this point in the history
patch for exception: no match of right hand side value
  • Loading branch information
jwilberding committed Oct 21, 2013
2 parents 794242f + 071f8f0 commit 58382fb
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/rlx_prv_config.erl
Original file line number Diff line number Diff line change
Expand Up @@ -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)};
Expand Down

0 comments on commit 58382fb

Please sign in to comment.