diff options
author | Eric <[email protected]> | 2012-09-18 17:29:26 -0700 |
---|---|---|
committer | Eric <[email protected]> | 2012-09-18 17:29:26 -0700 |
commit | 8f2670540b6cef76726224801a696cfbed4f3738 (patch) | |
tree | 4cd1e463cf3c52eca6626d1caf27fd821d1f402d /src/rcl_prv_release.erl | |
parent | 388b5f05a634225dcc746293850948a02951330a (diff) | |
download | relx-8f2670540b6cef76726224801a696cfbed4f3738.tar.gz relx-8f2670540b6cef76726224801a696cfbed4f3738.tar.bz2 relx-8f2670540b6cef76726224801a696cfbed4f3738.zip |
add depsolver directly to the system
This is sub-optimal but I suspect rcl_depsolver is going to migrate
away from depsolver in any case.
Diffstat (limited to 'src/rcl_prv_release.erl')
-rw-r--r-- | src/rcl_prv_release.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rcl_prv_release.erl b/src/rcl_prv_release.erl index 0d692da..0d2e1d7 100644 --- a/src/rcl_prv_release.erl +++ b/src/rcl_prv_release.erl @@ -63,28 +63,28 @@ format_error({release_not_found, {RelName, RelVsn}}) -> io_lib:format("No releases exist in the system for ~p:~s!", [RelName, RelVsn]); format_error({failed_solve, Error}) -> io_lib:format("Failed to solve release:\n ~s", - [depsolver:format_error({error, Error})]). + [rcl_depsolver:format_error({error, Error})]). %%%=================================================================== %%% Internal Functions %%%=================================================================== --spec create_dep_graph(rcl_state:t()) -> depsolver:t(). +-spec create_dep_graph(rcl_state:t()) -> rcl_depsolver:t(). create_dep_graph(State) -> Apps = rcl_state:available_apps(State), - Graph0 = depsolver:new_graph(), + Graph0 = rcl_depsolver:new_graph(), lists:foldl(fun(App, Graph1) -> AppName = rcl_app_info:name(App), AppVsn = rcl_app_info:vsn(App), Deps = rcl_app_info:active_deps(App) ++ rcl_app_info:library_deps(App), - depsolver:add_package_version(Graph1, + rcl_depsolver:add_package_version(Graph1, AppName, AppVsn, Deps) end, Graph0, Apps). --spec find_default_release(rcl_state:t(), depsolver:t()) -> +-spec find_default_release(rcl_state:t(), rcl_depsolver:t()) -> {ok, rcl_state:t()} | relcool:error(). find_default_release(State, DepGraph) -> case rcl_state:default_release(State) of @@ -151,7 +151,7 @@ solve_release(State0, DepGraph, RelName, RelVsn) -> try Release = rcl_state:get_release(State0, RelName, RelVsn), Goals = rcl_release:goals(Release), - case depsolver:solve(DepGraph, Goals) of + case rcl_depsolver:solve(DepGraph, Goals) of {ok, Pkgs} -> set_resolved(State0, Release, Pkgs); {error, Error} -> |