From 25ff68a87e3264b6dfdc846823d4912b4dd870b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Wed, 12 Jun 2013 17:00:43 +0300 Subject: solver: prune broken world dependencies with --force mostly useful for reboot, when all packages are not available. --- src/commit.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/commit.c') diff --git a/src/commit.c b/src/commit.c index f0e9e847db..f426ba0741 100644 --- a/src/commit.c +++ b/src/commit.c @@ -536,17 +536,11 @@ int apk_solver_commit(struct apk_database *db, } r = apk_solver_solve(db, solver_flags, world, &changeset); - if (r < 0) - return r; - - if (r == 0 || (apk_flags & APK_FORCE)) { - /* Success -- or forced installation of bad graph */ + if (r == 0) r = apk_solver_commit_changeset(db, &changeset, world); - } else { - /* Failure -- print errors */ + else apk_solver_print_errors(db, &changeset, world); - } - apk_change_array_free(&changeset.changes); + apk_change_array_free(&changeset.changes); return r; } -- cgit v1.2.3