diff options
author | Tristan Sloughter <[email protected]> | 2018-10-05 07:13:56 -0600 |
---|---|---|
committer | GitHub <[email protected]> | 2018-10-05 07:13:56 -0600 |
commit | bb8af6ddec20f44599f7cd0c3e626996a3206dad (patch) | |
tree | 665931ea9a6ded163c39ca6ebb9a92649be1ee15 /src/rlx_config.erl | |
parent | 048788f3264600ec4f36a2dfd1ebfae7030998b0 (diff) | |
download | relx-bb8af6ddec20f44599f7cd0c3e626996a3206dad.tar.gz relx-bb8af6ddec20f44599f7cd0c3e626996a3206dad.tar.bz2 relx-bb8af6ddec20f44599f7cd0c3e626996a3206dad.zip |
support tuples in overlay_vars so rebar3 can pass variables (#672)v3.27.0
Diffstat (limited to 'src/rlx_config.erl')
-rw-r--r-- | src/rlx_config.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/rlx_config.erl b/src/rlx_config.erl index ee58db5..b341ae7 100644 --- a/src/rlx_config.erl +++ b/src/rlx_config.erl @@ -303,8 +303,9 @@ list_of_overlay_vars_files(undefined) -> []; list_of_overlay_vars_files([]) -> []; -list_of_overlay_vars_files([H | _]=FileNames) when erlang:is_list(H) -> - FileNames; +list_of_overlay_vars_files([H | _]=Vars) when erlang:is_list(H) ; + is_tuple(H) -> + Vars; list_of_overlay_vars_files(FileName) when is_list(FileName) -> [FileName]. @@ -328,7 +329,8 @@ merge_configs([{Key, Value} | CliTerms], ConfigTerms) -> end; overlay_vars -> case lists:keyfind(overlay_vars, 1, ConfigTerms) of - {_, [H | _] = Vars} when is_list(H) -> + {_, [H | _] = Vars} when is_list(H) ; + is_tuple(H) -> MergedValue = Vars ++ Value, merge_configs(CliTerms, lists:keyreplace(overlay_vars, 1, ConfigTerms, {Key, MergedValue})); {_, Vars} when is_list(Vars) -> |