From c3f01bc7ded59104b363edb8e9efd59db410c058 Mon Sep 17 00:00:00 2001
From: Kozlov Yakov <yk@exante.eu>
Date: Tue, 15 Mar 2016 15:55:16 +0300
Subject: Fixed template args order bug

---
 src/rlx_prv_overlay.erl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

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})),
-- 
cgit v1.2.3