aboutsummaryrefslogtreecommitdiffstats
path: root/src/rlx_prv_release.erl
diff options
context:
space:
mode:
authorJordan Wilberding <[email protected]>2014-11-06 09:21:41 -0800
committerJordan Wilberding <[email protected]>2014-11-06 09:21:41 -0800
commit75b44fa44ef70e078dd450bf68bfaea4d48bf4e3 (patch)
treec91e2cb7d92232a7f216e1c8b19eadba3aacd17b /src/rlx_prv_release.erl
parent655b54a45c5d1a2e319841408c0b5431ea0cd9e2 (diff)
parent79bbf33cbd46c9a1beeae00424e14969608385ba (diff)
downloadrelx-75b44fa44ef70e078dd450bf68bfaea4d48bf4e3.tar.gz
relx-75b44fa44ef70e078dd450bf68bfaea4d48bf4e3.tar.bz2
relx-75b44fa44ef70e078dd450bf68bfaea4d48bf4e3.zip
Merge pull request #252 from tsloughter/master
Split app and release discovery and format_error fix
Diffstat (limited to 'src/rlx_prv_release.erl')
-rw-r--r--src/rlx_prv_release.erl10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/rlx_prv_release.erl b/src/rlx_prv_release.erl
index bd5acc4..3eb59d1 100644
--- a/src/rlx_prv_release.erl
+++ b/src/rlx_prv_release.erl
@@ -18,10 +18,6 @@
%%% @author Eric Merritt <[email protected]>
%%% @copyright (C) 2012 Erlware, LLC.
%%%
-%%% @doc This provider uses the lib_dir setting of the state. It searches the
-%%% Lib Dirs looking for all OTP Applications that are available. When it finds
-%%% those OTP Applications it loads the information about them and adds them to
-%%% the state of available apps. This implements the provider behaviour.
-module(rlx_prv_release).
-behaviour(provider).
@@ -33,7 +29,7 @@
-include("relx.hrl").
-define(PROVIDER, resolve_release).
--define(DEPS, [discover]).
+-define(DEPS, [app_discover]).
%%============================================================================
%% API
@@ -75,9 +71,9 @@ format_error({no_releases_for, RelName}, _) ->
io_lib:format("No releases exist in the system for ~s!", [RelName]);
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}, _) ->
+format_error({failed_solve, Error}, State) ->
io_lib:format("Failed to solve release:\n ~s",
- [rlx_depsolver:format_error({error, Error})]).
+ [rlx_depsolver:format_error({error, Error}, State)]).
%%%===================================================================
%%% Internal Functions