diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2015-08-04 17:28:40 -0400 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2015-08-04 17:28:40 -0400 |
| commit | 1a061b9c9a27c46b079caf2fa80aaf5d541823b8 (patch) | |
| tree | 8ea00ccea472a903445038b882e71f2ccafb46d8 /src/rebar_app_discover.erl | |
| parent | a705f1e4f6a93313546fd68ce857a6d69a45661a (diff) | |
| parent | 4bcab8ef9643750808f5133b1ee074fbe66bdcfe (diff) | |
Merge pull request #610 from tsloughter/deps_tree
add tree option to deps command that prints pkg deps tree
Diffstat (limited to 'src/rebar_app_discover.erl')
| -rw-r--r-- | src/rebar_app_discover.erl | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/rebar_app_discover.erl b/src/rebar_app_discover.erl index a350235..c5a79a6 100644 --- a/src/rebar_app_discover.erl +++ b/src/rebar_app_discover.erl @@ -61,7 +61,7 @@ merge_deps(AppInfo, State) -> State1 = lists:foldl(fun(Profile, StateAcc) -> AppProfDeps = rebar_state:get(AppState, {deps, Profile}, []), TopLevelProfDeps = rebar_state:get(StateAcc, {deps, Profile}, []), - ProfDeps2 = dedup(rebar_utils:tup_umerge( + ProfDeps2 = rebar_utils:tup_dedup(rebar_utils:tup_umerge( rebar_utils:tup_sort(TopLevelProfDeps) ,rebar_utils:tup_sort(AppProfDeps))), rebar_state:set(StateAcc, {deps, Profile}, ProfDeps2) @@ -156,11 +156,6 @@ create_app_info(AppDir, AppFile) -> end, rebar_app_info:dir(rebar_app_info:valid(AppInfo1, Valid), AppDir). -dedup([]) -> []; -dedup([A]) -> [A]; -dedup([H,H|T]) -> dedup([H|T]); -dedup([H|T]) -> [H|dedup(T)]. - %% Read in and parse the .app file if it is availabe. Do the same for %% the .app.src file if it exists. try_handle_app_file([], AppDir, [], AppSrcScriptFile, Validate) -> |