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/upgrade.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/upgrade.c') diff --git a/src/upgrade.c b/src/upgrade.c index 879e14c..611f677 100644 --- a/src/upgrade.c +++ b/src/upgrade.c @@ -46,14 +46,12 @@ static int upgrade_main(void *ctx, struct apk_database *db, int argc, char **arg dep->result_mask = APK_VERSION_EQUAL | APK_VERSION_LESS | APK_VERSION_GREATER; dep->version = NULL; } - r = apk_state_lock_dependency(state, dep); - if (r != 0) { - apk_error("Unable to upgrade '%s'", - dep->name->name); - goto err; - } + r |= apk_state_lock_dependency(state, dep); } - r = apk_state_commit(state, db); + if (r == 0) + r = apk_state_commit(state, db); + else + apk_state_print_errors(state); err: if (state != NULL) apk_state_unref(state); -- cgit v1.2.3