aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKozlov Yakov <[email protected]>2016-03-15 15:55:16 +0300
committerKozlov Yakov <[email protected]>2016-03-15 15:55:16 +0300
commitc3f01bc7ded59104b363edb8e9efd59db410c058 (patch)
treea9d045bd43d2c3ffb74a4f978916059777668865 /src
parent7ec3d166c07c8cd1e5a182c92a8c73a0dd4727d8 (diff)
downloadrelx-c3f01bc7ded59104b363edb8e9efd59db410c058.tar.gz
relx-c3f01bc7ded59104b363edb8e9efd59db410c058.tar.bz2
relx-c3f01bc7ded59104b363edb8e9efd59db410c058.zip
Fixed template args order bug
Diffstat (limited to 'src')
-rw-r--r--src/rlx_prv_overlay.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rlx_prv_overlay.erl b/src/rlx_prv_overlay.erl
index 412e5ba..becdb32 100644
--- a/src/rlx_prv_overlay.erl
+++ b/src/rlx_prv_overlay.erl
@@ -197,7 +197,9 @@ merge_overlay_vars(State, FileNames) ->
%% to the current one being read
OverlayRelativeRoot = filename:dirname(FileName),
NewTerms = check_overlay_inclusion(State, OverlayRelativeRoot, Terms),
- lists:ukeymerge(1, lists:ukeysort(1, NewTerms), Acc);
+ lists:foldl(fun(NewTerm, A) ->
+ lists:keystore(element(1, NewTerm), 1, A, NewTerm)
+ end, Acc, NewTerms);
{error, Reason} ->
ec_cmd_log:warn(rlx_state:log(State),
format_error({unable_to_read_varsfile, FileName, Reason})),