From ba005f2e97b025d91758f513e808717e4baa4287 Mon Sep 17 00:00:00 2001 From: Timo Teras Date: Thu, 6 Aug 2009 16:54:59 +0300 Subject: state: bug fix --- src/add.c | 3 ++- src/state.c | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/add.c b/src/add.c index 710f606..4cc81b2 100644 --- a/src/add.c +++ b/src/add.c @@ -131,7 +131,8 @@ static int add_main(void *ctx, struct apk_database *db, int argc, char **argv) for (i = 0; (pkgs != NULL) && i < pkgs->num; i++) { r = apk_state_lock_dependency(state, &pkgs->item[i]); if (r != 0) { - apk_error("Unable to install '%s'", pkgs->item[i].name->name); + apk_error("Unable to install '%s': %d", + pkgs->item[i].name->name, r); if (!(apk_flags & APK_FORCE)) goto err; } diff --git a/src/state.c b/src/state.c index a46fc4f..dcb2c7c 100644 --- a/src/state.c +++ b/src/state.c @@ -113,11 +113,10 @@ static struct apk_name_choices *name_choices_new(struct apk_database *db, & dep->result_mask) { j++; } else { - nc->pkgs[i] = nc->pkgs[nc->num - 1]; + nc->pkgs[j] = nc->pkgs[nc->num - 1]; nc->num--; } } - } return nc; -- cgit v1.2.3-70-g09d2