aboutsummaryrefslogtreecommitdiffstats
path: root/src/rlx_depsolver.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_depsolver.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_depsolver.erl')
-rw-r--r--src/rlx_depsolver.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/rlx_depsolver.erl b/src/rlx_depsolver.erl
index fd26145..c7f2f5c 100644
--- a/src/rlx_depsolver.erl
+++ b/src/rlx_depsolver.erl
@@ -76,7 +76,7 @@
-module(rlx_depsolver).
%% Public Api
--export([format_error/1,
+-export([format_error/2,
format_roots/1,
format_culprits/1,
format_constraint/1,
@@ -326,9 +326,9 @@ filter_packages(PVPairs, RawConstraints) ->
%% could not be satisfied
-spec format_error({error, {unreachable_package, list()} |
{invalid_constraints, [constraint()]} |
- list()}) -> iolist().
-format_error(Error) ->
- rlx_depsolver_culprit:format_error(Error).
+ list()}, rlx_state:t()) -> iolist().
+format_error(Error, State) ->
+ rlx_depsolver_culprit:format_error(Error, State).
%% @doc Return a formatted list of roots of the dependency trees which
%% could not be satisified. These may also have versions attached.