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

upgrade: allow for specified package upgrades 

Fixes #10667 and #10700
cute-signatures
Ariadne Conill 2020-07-14 18:16:38 -06:00 committed by Timo Teräs
parent ffcdd350d0
commit bef1faf1cb
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/apk-upgrade.8.scd
View File

@ -6,7 +6,7 @@ apk upgrade - upgrade installed packages
# SYNOPSIS # SYNOPSIS
*apk upgrade* [<_options_>...] *apk upgrade* [<_options_>...] [<_packages_>...]
# DESCRIPTION # DESCRIPTION

22
src/app_upgrade.c
View File

@ -21,6 +21,7 @@ struct upgrade_ctx {
int no_self_upgrade : 1; int no_self_upgrade : 1;
int self_upgrade_only : 1; int self_upgrade_only : 1;
int ignore : 1; int ignore : 1;
int errors;
}; };
enum { enum {
@ -137,6 +138,17 @@ ret:
return r; return r;
} }
static void set_upgrade_for_name(struct apk_database *db, const char *match, struct apk_name *name, void *pctx)
{
struct upgrade_ctx *uctx = (struct upgrade_ctx *) pctx;
if (!name) {
apk_error("Package '%s' not found", match);
uctx->errors++;
} else
apk_solver_set_name_flags(name, APK_SOLVERF_UPGRADE, 0);
}
static int upgrade_main(void *ctx, struct apk_database *db, struct apk_string_array *args) static int upgrade_main(void *ctx, struct apk_database *db, struct apk_string_array *args)
{ {
struct upgrade_ctx *uctx = (struct upgrade_ctx *) ctx; struct upgrade_ctx *uctx = (struct upgrade_ctx *) ctx;
@ -181,6 +193,16 @@ static int upgrade_main(void *ctx, struct apk_database *db, struct apk_string_ar
world = db->world; world = db->world;
} }
if (args->num > 0) {
/* if specific packages are listed, we don't want to upgrade world. */
solver_flags &= ~APK_SOLVERF_UPGRADE;
apk_name_foreach_matching(db, args, apk_foreach_genid(), set_upgrade_for_name, &uctx);
if (uctx->errors)
return uctx->errors;
}
r = apk_solver_commit(db, solver_flags, world); r = apk_solver_commit(db, solver_flags, world);
if (solver_flags & APK_SOLVERF_AVAILABLE) if (solver_flags & APK_SOLVERF_AVAILABLE)