summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorViacheslav V. Kovalev <kovyl2404@gmail.com>2015-04-22 21:44:23 +0300
committerViacheslav V. Kovalev <kovyl2404@gmail.com>2015-04-22 21:44:23 +0300
commit29a855d31c7fe7fd7504f5d0ec95c9a55e27276f (patch)
treeefbb94163b70c64fb5f3c3049b1b8461d83a4871 /src
parentd821757152be83d2f473d4d4e2157dba72a6d345 (diff)
Revert accidentially changed formatting
Diffstat (limited to 'src')
-rw-r--r--src/rebar_state.erl1
-rw-r--r--src/rebar_utils.erl2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/rebar_state.erl b/src/rebar_state.erl
index c2e479d..9b8d261 100644
--- a/src/rebar_state.erl
+++ b/src/rebar_state.erl
@@ -232,6 +232,7 @@ do_deduplicate([Head | Rest], Acc) ->
merge_opts(Profile, NewOpts, OldOpts) ->
Opts = merge_opts(NewOpts, OldOpts),
+
case dict:find(deps, NewOpts) of
{ok, Value} ->
dict:store({deps, Profile}, Value, Opts);
diff --git a/src/rebar_utils.erl b/src/rebar_utils.erl
index 004ed35..bc2e4ac 100644
--- a/src/rebar_utils.erl
+++ b/src/rebar_utils.erl
@@ -257,7 +257,7 @@ tup_sort(List) ->
tup_umerge([], Olds) ->
Olds;
tup_umerge([New|News], Olds) ->
- lists:reverse( umerge(News, Olds, [], New) ).
+ lists:reverse(umerge(News, Olds, [], New)).
%% This is equivalent to umerge2_2 in the stdlib, except we use the expanded
%% value/key only to compare