From e51232e710dfd32764e2c2d0599df83ab85a9c74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Thu, 13 Jun 2013 18:20:39 +0300 Subject: errors: rewrite the logic how errors are reported Instead of the dependency oriented logic, switch to print them for each package or name needed. Might give a bit more readable errors now. There's still few corner cases that proper error is not output, which are cought by the test cases. --- src/solver.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/solver.c') diff --git a/src/solver.c b/src/solver.c index 71a4d41..58bb30b 100644 --- a/src/solver.c +++ b/src/solver.c @@ -435,6 +435,9 @@ static int compare_providers(struct apk_solver_state *ss, /* Prefer those that were in last dependency merging group */ r = (int)pkgA->ss.dependencies_used - (int)pkgB->ss.dependencies_used; + if (r) + return r; + r = pkgB->ss.conflicts - pkgA->ss.conflicts; if (r) return r; -- cgit v1.2.3