aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis Rascão <[email protected]>2019-01-03 23:47:49 +0000
committerGitHub <[email protected]>2019-01-03 23:47:49 +0000
commitba0986b55bbee9b28b9467658312c1d9d93a4b40 (patch)
treef4e143da70211abc60c66be9cf47fbccdf465535
parentccf7dc91c0e91f820ab5e283a24efa8752699aea (diff)
parent64871e4cb37b2f52c0956b81bbdf1e500977fd01 (diff)
downloadrelx-ba0986b55bbee9b28b9467658312c1d9d93a4b40.tar.gz
relx-ba0986b55bbee9b28b9467658312c1d9d93a4b40.tar.bz2
relx-ba0986b55bbee9b28b9467658312c1d9d93a4b40.zip
Merge pull request #679 from aboroska/fix-default-release
fix handling of default_release in config
-rw-r--r--src/rlx_config.erl3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/rlx_config.erl b/src/rlx_config.erl
index b341ae7..4160bba 100644
--- a/src/rlx_config.erl
+++ b/src/rlx_config.erl
@@ -339,6 +339,9 @@ merge_configs([{Key, Value} | CliTerms], ConfigTerms) ->
false ->
merge_configs(CliTerms, ConfigTerms++[{Key, Value}])
end;
+ default_release when Value =:= {undefined, undefined} ->
+ %% No release specified in cli. Prevent overwriting default_release in ConfigTerms.
+ merge_configs(CliTerms, lists:keymerge(1, ConfigTerms, [{Key, Value}]));
_ ->
merge_configs(CliTerms, lists:reverse(lists:keystore(Key, 1, lists:reverse(ConfigTerms), {Key, Value})))
end.