summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTristan Sloughter <t@crashfast.com>2015-03-02 07:56:47 -0600
committerTristan Sloughter <t@crashfast.com>2015-03-02 08:19:23 -0600
commit80f276e5e51379b6aae59f99474d25da68f0227a (patch)
tree000804e06a711f99e3e2400f5cfaf062b0907b34 /src
parent71d70fca1f1182b8f4919e2b3f5a7ff277700271 (diff)
don't replace non-string list with empty list in profile merge
Diffstat (limited to 'src')
-rw-r--r--src/rebar_state.erl7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/rebar_state.erl b/src/rebar_state.erl
index 09f1c43..2f8ab59 100644
--- a/src/rebar_state.erl
+++ b/src/rebar_state.erl
@@ -204,6 +204,13 @@ apply_profiles(State=#state_t{opts=Opts, current_profiles=CurrentProfiles}, Prof
merge_opts(Profile, NewOpts, OldOpts) ->
Opts = dict:merge(fun(_Key, NewValue, OldValue) when is_list(NewValue) ->
case io_lib:printable_list(NewValue) of
+ true when NewValue =:= [] ->
+ case io_lib:printable_list(OldValue) of
+ true ->
+ NewValue;
+ false ->
+ OldValue
+ end;
true ->
NewValue;
false ->