diff options
author | Timo Teras <timo.teras@iki.fi> | 2009-08-06 16:54:59 +0300 |
---|---|---|
committer | Timo Teras <timo.teras@iki.fi> | 2009-08-06 16:54:59 +0300 |
commit | ba005f2e97b025d91758f513e808717e4baa4287 (patch) | |
tree | 36481d492486abec9d2dc4c34203c8c46b295e71 | |
parent | bf7b80662d75181caf1619c047078dafe80346f9 (diff) | |
download | apk-tools-ba005f2e97b025d91758f513e808717e4baa4287.tar.gz apk-tools-ba005f2e97b025d91758f513e808717e4baa4287.tar.bz2 apk-tools-ba005f2e97b025d91758f513e808717e4baa4287.tar.xz apk-tools-ba005f2e97b025d91758f513e808717e4baa4287.zip |
state: bug fix
-rw-r--r-- | src/add.c | 3 | ||||
-rw-r--r-- | src/state.c | 3 |
2 files changed, 3 insertions, 3 deletions
@@ -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; |