diff options
| author | Tristan Sloughter <[email protected]> | 2019-08-13 09:25:26 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-08-13 09:25:26 -0600 |
| commit | def78e1c07c2ae79b8ba5293365a466e79a88b15 (patch) | |
| tree | 2f3fbf7a07136767fddd8342e01eb0fddc777620 /src | |
| parent | 912f513028dee5b0e0900a8d5e3430669fccaf4c (diff) | |
| parent | e644d7c078c9b75edf1ba513a030d33921af8192 (diff) | |
| download | relx-def78e1c07c2ae79b8ba5293365a466e79a88b15.tar.gz relx-def78e1c07c2ae79b8ba5293365a466e79a88b15.tar.bz2 relx-def78e1c07c2ae79b8ba5293365a466e79a88b15.zip | |
Merge pull request #747 from arcusfelis/template-redefined-variable
Correctly render redefined variable
Diffstat (limited to 'src')
| -rw-r--r-- | src/rlx_prv_overlay.erl | 6 |
1 files changed, 4 insertions, 2 deletions
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})), |