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

del: don't print own name as reverse dependency

cute-signatures
Timo Teräs 2013-07-08 15:18:10 +03:00
parent 70e45998ad
commit 3f8c817b6e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/del.c
View File

@ -47,6 +47,9 @@ static void print_not_deleted_pkg(struct apk_package *pkg0, struct apk_dependenc
{ {
struct not_deleted_ctx *ctx = (struct not_deleted_ctx *) pctx; struct not_deleted_ctx *ctx = (struct not_deleted_ctx *) pctx;
if (pkg0->name == ctx->name)
goto no_print;
if (!ctx->header) { if (!ctx->header) {
apk_message("World updated, but the following packages are not removed due to:"); apk_message("World updated, but the following packages are not removed due to:");
ctx->header = 1; ctx->header = 1;
@ -57,6 +60,7 @@ static void print_not_deleted_pkg(struct apk_package *pkg0, struct apk_dependenc
} }
apk_print_indented(&ctx->indent, APK_BLOB_STR(pkg0->name->name)); apk_print_indented(&ctx->indent, APK_BLOB_STR(pkg0->name->name));
no_print:
apk_pkg_foreach_reverse_dependency(pkg0, ctx->matches, print_not_deleted_pkg, pctx); apk_pkg_foreach_reverse_dependency(pkg0, ctx->matches, print_not_deleted_pkg, pctx);
} }
@ -114,8 +118,10 @@ static int del_main(void *pctx, struct apk_database *db, struct apk_string_array
foreach_array_item(change, changeset.changes) foreach_array_item(change, changeset.changes)
if (change->new_pkg != NULL) if (change->new_pkg != NULL)
change->new_pkg->marked = 1; change->new_pkg->marked = 1;
apk_name_foreach_matching(db, args, apk_foreach_genid(), apk_name_foreach_matching(
print_not_deleted_name, &ndctx); db, args,
apk_foreach_genid() | APK_FOREACH_MARKED | APK_DEP_SATISFIES,
print_not_deleted_name, &ndctx);
if (ndctx.header) if (ndctx.header)
printf("\n"); printf("\n");