jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

state: bug fix

cute-signatures
Timo Teras 2009-08-06 16:54:59 +03:00
parent bf7b80662d
commit ba005f2e97
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/add.c
View File

@ -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++) { for (i = 0; (pkgs != NULL) && i < pkgs->num; i++) {
r = apk_state_lock_dependency(state, &pkgs->item[i]); r = apk_state_lock_dependency(state, &pkgs->item[i]);
if (r != 0) { 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)) if (!(apk_flags & APK_FORCE))
goto err; goto err;
} }

3
src/state.c
View File

@ -113,11 +113,10 @@ static struct apk_name_choices *name_choices_new(struct apk_database *db,
& dep->result_mask) { & dep->result_mask) {
j++; j++;
} else { } else {
nc->pkgs[i] = nc->pkgs[nc->num - 1]; nc->pkgs[j] = nc->pkgs[nc->num - 1];
nc->num--; nc->num--;
} }
} }
} }
return nc; return nc;