From 038b672061919296b68b83a1ccead9c31b650c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Tue, 1 Jun 2010 11:49:32 +0300 Subject: state: improve error messages from dependency failures Print more information why installation changeset calculation failed. Fixes #187. --- src/fix.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/fix.c') diff --git a/src/fix.c b/src/fix.c index 5c2ff545fa..f84fbc8909 100644 --- a/src/fix.c +++ b/src/fix.c @@ -84,14 +84,13 @@ static int fix_main(void *pctx, struct apk_database *db, int argc, char **argv) name->flags |= APK_NAME_REINSTALL; } - for (i = 0; i < argc; i++) { - r = apk_state_lock_dependency(state, &deps[i]); - if (r != 0) { - if (!(apk_flags & APK_FORCE)) - goto err; - } - } - r = apk_state_commit(state, db); + for (i = 0; i < argc; i++) + r |= apk_state_lock_dependency(state, &deps[i]); + + if (r == 0 || (apk_flags & APK_FORCE)) + r = apk_state_commit(state, db); + else + apk_state_print_errors(state); err: if (r != 0 && i < argc) apk_error("Error while processing '%s'", argv[i]); -- cgit v1.2.3