diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_digraph.erl | 33 | ||||
| -rw-r--r-- | src/rebar_pkg_resource.erl | 2 | ||||
| -rw-r--r-- | src/rebar_prv_install_deps.erl | 12 | ||||
| -rw-r--r-- | src/rebar_prv_update.erl | 3 |
4 files changed, 30 insertions, 20 deletions
diff --git a/src/rebar_digraph.erl b/src/rebar_digraph.erl index 3f942ef..129ea35 100644 --- a/src/rebar_digraph.erl +++ b/src/rebar_digraph.erl @@ -71,29 +71,36 @@ restore_graph({Vs, Es}) -> cull_deps(Graph, Vertices) -> cull_deps(Graph, Vertices, + 1, + lists:foldl(fun({Key, _}, Levels) -> dict:store(Key, 0, Levels) end, + dict:new(), Vertices), lists:foldl(fun({Key, _}=N, Solution) -> dict:store(Key, N, Solution) end, dict:new(), Vertices), []). -cull_deps(_Graph, [], Solution, Discarded) -> +cull_deps(_Graph, [], _Level, Levels, Solution, Discarded) -> {_, Vertices} = lists:unzip(dict:to_list(Solution)), - {ok, Vertices, Discarded}; -cull_deps(Graph, Vertices, Solution, Discarded) -> - {NV, NS, DS} = - lists:foldl(fun(V, {NewVertices, SolutionAcc, DiscardedAcc}) -> - OutNeighbors = digraph:out_neighbours(Graph, V), - lists:foldl(fun({Key, _}=N, {NewVertices1, SolutionAcc1, DiscardedAcc1}) -> + LvlVertices = [{App,Vsn,dict:fetch(App,Levels)} || {App,Vsn} <- Vertices], + {ok, LvlVertices, Discarded}; +cull_deps(Graph, Vertices, Level, Levels, Solution, Discarded) -> + {NV, NS, LS, DS} = + lists:foldl(fun(V, {NewVertices, SolutionAcc, LevelsAcc, DiscardedAcc}) -> + OutNeighbors = lists:keysort(1, digraph:out_neighbours(Graph, V)), + lists:foldl(fun({Key, _}=N, {NewVertices1, SolutionAcc1, LevelsAcc1, DiscardedAcc1}) -> case dict:find(Key, SolutionAcc1) of {ok, N} -> % already seen - {NewVertices1, SolutionAcc1, DiscardedAcc1}; + {NewVertices1, SolutionAcc1, LevelsAcc, DiscardedAcc1}; {ok, _} -> % conflict resolution! - {NewVertices1, SolutionAcc1, [N|DiscardedAcc1]}; + {NewVertices1, SolutionAcc1, LevelsAcc, [N|DiscardedAcc1]}; error -> - {[N | NewVertices1], dict:store(Key, N, SolutionAcc1), DiscardedAcc1} + {[N | NewVertices1], + dict:store(Key, N, SolutionAcc1), + dict:store(Key, Level, LevelsAcc1), + DiscardedAcc1} end - end, {NewVertices, SolutionAcc, DiscardedAcc}, OutNeighbors) - end, {[], Solution, Discarded}, lists:sort(Vertices)), - cull_deps(Graph, NV, NS, DS). + end, {NewVertices, SolutionAcc, LevelsAcc, DiscardedAcc}, OutNeighbors) + end, {[], Solution, Levels, Discarded}, lists:keysort(1, Vertices)), + cull_deps(Graph, NV, Level+1, LS, NS, DS). subgraph(Graph, Vertices) -> digraph_utils:subgraph(Graph, Vertices). diff --git a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl index 0508e2c..3b44fc8 100644 --- a/src/rebar_pkg_resource.erl +++ b/src/rebar_pkg_resource.erl @@ -14,7 +14,7 @@ lock(_AppDir, Source) -> Source. -needs_update(Dir, {pkg, _Name, Vsn, _Url}) -> +needs_update(Dir, {pkg, _Name, Vsn}) -> [AppInfo] = rebar_app_discover:find_apps([Dir], all), case rebar_app_info:original_vsn(AppInfo) =:= ec_cnv:to_list(Vsn) of true -> diff --git a/src/rebar_prv_install_deps.erl b/src/rebar_prv_install_deps.erl index 6270660..1e2a4e9 100644 --- a/src/rebar_prv_install_deps.erl +++ b/src/rebar_prv_install_deps.erl @@ -204,8 +204,9 @@ update_pkg_deps(Profile, Pkgs, Packages, Upgrade, Seen, State) -> handle_pkg_dep(Profile, Pkg, Packages, Upgrade, DepsDir, Fetched, Seen, State) -> AppInfo = package_to_app(DepsDir, Packages, Pkg), - {NewSeen, NewState} = maybe_lock(Profile, AppInfo, Seen, State, 0), - case maybe_fetch(AppInfo, Upgrade, NewSeen, NewState) of + Level = rebar_app_info:dep_level(AppInfo), + {NewSeen, NewState} = maybe_lock(Profile, AppInfo, Seen, State, Level), + case maybe_fetch(AppInfo, Upgrade, Seen, NewState) of true -> {[AppInfo | Fetched], NewSeen, NewState}; false -> @@ -234,7 +235,7 @@ maybe_lock(Profile, AppInfo, Seen, State, Level) -> {Seen, State} end. -package_to_app(DepsDir, Packages, {Name, Vsn}) -> +package_to_app(DepsDir, Packages, {Name, Vsn, Level}) -> case dict:find({Name, Vsn}, Packages) of error -> throw(?PRV_ERROR({missing_package, Name, Vsn})); @@ -244,7 +245,8 @@ package_to_app(DepsDir, Packages, {Name, Vsn}) -> {ok, AppInfo} = rebar_app_info:new(Name, Vsn), AppInfo1 = rebar_app_info:deps(AppInfo, PkgDeps), AppInfo2 = rebar_app_info:dir(AppInfo1, rebar_dir:deps_dir(DepsDir, Name)), - rebar_app_info:source(AppInfo2, {pkg, Name, Vsn}) + AppInfo3 = rebar_app_info:dep_level(AppInfo2, Level), + rebar_app_info:source(AppInfo3, {pkg, Name, Vsn}) end. -spec update_src_deps(atom(), non_neg_integer(), list(), list(), list(), rebar_state:t(), boolean(), sets:set(binary()), list()) -> {rebar_state:t(), list(), list(), sets:set(binary())}. @@ -432,6 +434,8 @@ parse_dep({Name, _Vsn, Source, Opts}, {SrcDepsAcc, PkgDepsAcc}, DepsDir, State) ?WARN("Dependency option list ~p in ~p is not supported and will be ignored", [Opts, Name]), Dep = new_dep(DepsDir, Name, [], Source, State), {[Dep | SrcDepsAcc], PkgDepsAcc}; +parse_dep({_Name, {pkg, Name, Vsn}, Level}, {SrcDepsAcc, PkgDepsAcc}, _, _) when is_integer(Level) -> + {SrcDepsAcc, [{Name, Vsn} | PkgDepsAcc]}; parse_dep({Name, Source, Level}, {SrcDepsAcc, PkgDepsAcc}, DepsDir, State) when is_tuple(Source) , is_integer(Level) -> Dep = new_dep(DepsDir, Name, [], Source, State), diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl index 20f6974..162c67c 100644 --- a/src/rebar_prv_update.erl +++ b/src/rebar_prv_update.erl @@ -47,8 +47,7 @@ do(State) -> write_registry(Dict, Graph, State), ok catch - E:C -> - io:format("E C ~p ~p~n", [E, C]), + _E:_C -> throw({error, {?MODULE, package_index_write}}) end, |