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

Merge branch 'master' into prog

cute-signatures
Natanael Copa 2010-02-26 13:35:45 +00:00
parent 028990d576 9f3fbedcc9
commit 2d7171b2e7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/add.c
View File

@ -63,7 +63,7 @@ static int add_main(void *ctx, struct apk_database *db, int argc, char **argv)
struct apk_package *virtpkg = NULL;
struct apk_dependency virtdep;
struct apk_dependency *deps;
int i, r = 0, num_deps = 0;
int i, r = 0, num_deps = 0, errors = 0;
if (actx->virtpkg) {
if (non_repository_check(db))
@ -136,10 +136,12 @@ static int add_main(void *ctx, struct apk_database *db, int argc, char **argv)
} else {
apk_error("Unable to install '%s': %d",
deps[i].name->name, r);
if (!(apk_flags & APK_FORCE))
goto err;
errors++;
}
}
if (errors && !(apk_flags & APK_FORCE))
goto err;
r = apk_state_commit(state, db);
err:
if (state != NULL)