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

fix: upgrade also mentioned package (fixes #136)

cute-signatures
Timo Teras 2009-08-17 15:37:19 +03:00
parent 0b9bfa8d52
commit f9b2035897
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/fix.c
View File

@ -42,14 +42,14 @@ static int fix_main(void *pctx, struct apk_database *db, int argc, char **argv)
struct apk_state *state = NULL; struct apk_state *state = NULL;
struct apk_name *name; struct apk_name *name;
struct apk_package *pkg; struct apk_package *pkg;
struct apk_package **pkgs; struct apk_dependency *deps;
int r = 0, i, j; int r = 0, i, j;
state = apk_state_new(db); state = apk_state_new(db);
if (state == NULL) if (state == NULL)
return -1; return -1;
pkgs = alloca(sizeof(struct apk_package *) * argc); deps = alloca(sizeof(struct apk_dependency) * argc);
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
pkg = NULL; pkg = NULL;
if (strstr(argv[i], ".apk") != NULL) { if (strstr(argv[i], ".apk") != NULL) {
@ -63,10 +63,13 @@ static int fix_main(void *pctx, struct apk_database *db, int argc, char **argv)
apk_error("%s: %s", argv[i], apk_error_str(r)); apk_error("%s: %s", argv[i], apk_error_str(r));
goto err; goto err;
} }
name = pkg->name; apk_dep_from_pkg(&deps[i], db, pkg);
name = deps[i].name;
} else { } else {
name = apk_db_get_name(db, APK_BLOB_STR(argv[i])); apk_dep_from_blob(&deps[i], db, APK_BLOB_STR(argv[i]));
for (j = 0; name && name->pkgs && j < name->pkgs->num; j++) { name = deps[i].name;
for (j = 0; name->pkgs && j < name->pkgs->num; j++) {
if (name->pkgs->item[j]->ipkg != NULL) { if (name->pkgs->item[j]->ipkg != NULL) {
pkg = name->pkgs->item[j]; pkg = name->pkgs->item[j];
break; break;
@ -79,11 +82,10 @@ static int fix_main(void *pctx, struct apk_database *db, int argc, char **argv)
} }
if (ctx->reinstall) if (ctx->reinstall)
name->flags |= APK_NAME_REINSTALL; name->flags |= APK_NAME_REINSTALL;
pkgs[i] = pkg;
} }
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
r = apk_state_lock_name(state, pkg->name, pkg); r = apk_state_lock_dependency(state, &deps[i]);
if (r != 0) { if (r != 0) {
if (!(apk_flags & APK_FORCE)) if (!(apk_flags & APK_FORCE))
goto err; goto err;