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_prv_install_deps.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_prv_install_deps.erl')
| -rw-r--r-- | src/rebar_prv_install_deps.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl index 73d002a..b590d03 100644 --- a/src/rebar_prv_install_deps.erl +++ b/src/rebar_prv_install_deps.erl @@ -36,6 +36,7 @@ -include_lib("providers/include/providers.hrl"). -export([handle_deps_as_profile/4, + parse_deps/5, find_cycles/1, cull_compile/2]). @@ -122,7 +123,6 @@ handle_deps_as_profile(Profile, State, Deps, Upgrade) -> Locks = [], Level = 0, DepsDir = profile_dep_dir(State, Profile), - {SrcDeps, PkgDeps} = parse_deps(DepsDir, Deps, State, Locks, Level), AllSrcProfileDeps = [{Profile, SrcDeps, Locks, Level}], AllPkgProfileDeps = [{Profile, Locks, PkgDeps, Level}], @@ -511,7 +511,7 @@ parse_dep({Name, Vsn}, {SrcDepsAcc, PkgDepsAcc}, DepsDir, IsLock, State) when is {SrcDepsAcc, [parse_goal(ec_cnv:to_binary(Name) ,ec_cnv:to_binary(Vsn)) | PkgDepsAcc]} end; -parse_dep(Name, {SrcDepsAcc, PkgDepsAcc}, DepsDir, IsLock, State) when is_atom(Name) -> +parse_dep(Name, {SrcDepsAcc, PkgDepsAcc}, DepsDir, IsLock, State) when is_atom(Name); is_binary(Name) -> %% Unversioned package dependency {PkgName, PkgVsn} = get_package(ec_cnv:to_binary(Name), State), CheckoutsDir = ec_cnv:to_list(rebar_dir:checkouts_dir(State, Name)), |