From e644d7c078c9b75edf1ba513a030d33921af8192 Mon Sep 17 00:00:00 2001 From: Mikhail Uvarov Date: Mon, 12 Aug 2019 01:49:59 +0200 Subject: Correctly render redefined variable Rendering of variables behaves differently for already defined variables. Values of such variables are rendered in the wrong order, ignoring any variables above from the same file. --- src/rlx_prv_overlay.erl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/rlx_prv_overlay.erl') diff --git a/src/rlx_prv_overlay.erl b/src/rlx_prv_overlay.erl index 87fa91f..75608b3 100644 --- a/src/rlx_prv_overlay.erl +++ b/src/rlx_prv_overlay.erl @@ -187,9 +187,11 @@ merge_overlay_vars(State, FileNames) -> %% to the current one being read OverlayRelativeRoot = filename:dirname(FileName), NewTerms = check_overlay_inclusion(State, OverlayRelativeRoot, Terms), + %% Remove already defined variables from Acc, + %% append NewTerms, preserving order lists:foldl(fun(NewTerm, A) -> - lists:keystore(element(1, NewTerm), 1, A, NewTerm) - end, Acc, NewTerms); + lists:keydelete(element(1, NewTerm), 1, A) + end, Acc, NewTerms) ++ NewTerms; {error, Reason} -> ec_cmd_log:warn(rlx_state:log(State), format_error({unable_to_read_varsfile, FileName, Reason})), -- cgit v1.2.3