diff options
| author | Viacheslav V. Kovalev <kovyl2404@gmail.com> | 2015-04-22 21:44:23 +0300 |
|---|---|---|
| committer | Viacheslav V. Kovalev <kovyl2404@gmail.com> | 2015-04-22 21:44:23 +0300 |
| commit | 29a855d31c7fe7fd7504f5d0ec95c9a55e27276f (patch) | |
| tree | efbb94163b70c64fb5f3c3049b1b8461d83a4871 | |
| parent | d821757152be83d2f473d4d4e2157dba72a6d345 (diff) | |
Revert accidentially changed formatting
| -rw-r--r-- | src/rebar_state.erl | 1 | ||||
| -rw-r--r-- | src/rebar_utils.erl | 2 | ||||
| -rw-r--r-- | test/rebar_utils_SUITE.erl | 5 |
3 files changed, 4 insertions, 4 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 diff --git a/test/rebar_utils_SUITE.erl b/test/rebar_utils_SUITE.erl index ce26bbc..e9b32e2 100644 --- a/test/rebar_utils_SUITE.erl +++ b/test/rebar_utils_SUITE.erl @@ -29,8 +29,7 @@ all() -> - [{group, args_to_tasks} - ]. + [{group, args_to_tasks}]. groups() -> [{args_to_tasks, [], [empty_arglist, @@ -118,4 +117,4 @@ special_task_do(_Config) -> [{"foo", []}, {"do", ["bar,", "baz"]}] = rebar_utils:args_to_tasks(["foo,", "do", "bar,", - "baz"]).
\ No newline at end of file + "baz"]). |