diff options
author | Timo Teräs <timo.teras@iki.fi> | 2012-02-16 10:50:52 +0200 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2012-02-16 10:57:52 +0200 |
commit | 0800d7e050b738e7faa848291d6021175b853e29 (patch) | |
tree | 70d5709e8b87ad49fd3661d4eaf727d025b039d6 /src/del.c | |
parent | 7399f1950f5418dc7942579d5e9ed9807c764cce (diff) | |
download | apk-tools-0800d7e050b738e7faa848291d6021175b853e29.tar.gz apk-tools-0800d7e050b738e7faa848291d6021175b853e29.tar.bz2 apk-tools-0800d7e050b738e7faa848291d6021175b853e29.tar.xz apk-tools-0800d7e050b738e7faa848291d6021175b853e29.zip |
solver: record repository tag, and flags in solution
name state could get overwritten later, so we can't use that when
generating the changeset.
Diffstat (limited to 'src/del.c')
-rw-r--r-- | src/del.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -125,7 +125,7 @@ static int del_main(void *pctx, struct apk_database *db, int argc, char **argv) struct del_ctx *ctx = (struct del_ctx *) pctx; struct apk_name **name; struct apk_changeset changeset = {}; - struct apk_package_array *solution = NULL; + struct apk_solution_array *solution = NULL; struct not_deleted_ctx ndctx = {}; int i, r = 0; @@ -145,7 +145,7 @@ static int del_main(void *pctx, struct apk_database *db, int argc, char **argv) if (r == 0 || (apk_flags & APK_FORCE)) { /* check for non-deleted package names */ for (i = 0; i < solution->num; i++) { - struct apk_package *pkg = solution->item[i]; + struct apk_package *pkg = solution->item[i].pkg; pkg->name->state_ptr = pkg; pkg->state_int = 0; } @@ -165,7 +165,7 @@ static int del_main(void *pctx, struct apk_database *db, int argc, char **argv) } else { apk_solver_print_errors(db, solution, ctx->world, r); } - apk_package_array_free(&solution); + apk_solution_array_free(&solution); apk_dependency_array_free(&ctx->world); return r; |