diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2023-03-04 13:54:54 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2023-03-06 21:39:48 +0200 |
| commit | 65b46f7462e1acad19884da67a9a59996a642847 (patch) | |
| tree | 1997054daa45211d97bc273f0a50ccdfe2084ff5 /src/app_upgrade.c | |
| parent | 5f84463a34bd8c63a3ff649ae550c68934adaa5b (diff) | |
| download | apk-tools-65b46f7462e1acad19884da67a9a59996a642847.tar.gz apk-tools-65b46f7462e1acad19884da67a9a59996a642847.tar.bz2 apk-tools-65b46f7462e1acad19884da67a9a59996a642847.tar.xz apk-tools-65b46f7462e1acad19884da67a9a59996a642847.zip | |
db, apps: sort display results based on package names
Diffstat (limited to 'src/app_upgrade.c')
| -rw-r--r-- | src/app_upgrade.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/app_upgrade.c b/src/app_upgrade.c index e0ebcf5..77f1d2a 100644 --- a/src/app_upgrade.c +++ b/src/app_upgrade.c @@ -139,7 +139,7 @@ ret: return r; } -static void set_upgrade_for_name(struct apk_database *db, const char *match, struct apk_name *name, void *pctx) +static int set_upgrade_for_name(struct apk_database *db, const char *match, struct apk_name *name, void *pctx) { struct apk_out *out = &db->ctx->out; struct upgrade_ctx *uctx = (struct upgrade_ctx *) pctx; @@ -147,10 +147,11 @@ static void set_upgrade_for_name(struct apk_database *db, const char *match, str if (!name) { apk_err(out, "Package '%s' not found", match); uctx->errors++; - return; + return 0; } apk_solver_set_name_flags(name, uctx->ignore ? APK_SOLVERF_INSTALLED : APK_SOLVERF_UPGRADE, 0); + return 0; } static int upgrade_main(void *ctx, struct apk_ctx *ac, struct apk_string_array *args) @@ -213,7 +214,7 @@ static int upgrade_main(void *ctx, struct apk_ctx *ac, struct apk_string_array * if (args->num > 0) { /* if specific packages are listed, we don't want to upgrade world. */ if (!uctx->ignore) solver_flags &= ~APK_SOLVERF_UPGRADE; - apk_name_foreach_matching(db, args, apk_foreach_genid(), set_upgrade_for_name, uctx); + apk_db_foreach_matching_name(db, args, set_upgrade_for_name, uctx); if (uctx->errors) return uctx->errors; } |