diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2022-12-28 14:42:23 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2022-12-28 14:59:32 +0200 |
| commit | 40f6720a3ffd448bd338412cf975befc71461abd (patch) | |
| tree | c92a833ffbced3e683fab1a8acc1e28d7c915c6f | |
| parent | 22cc01645d93b6cf97e8d154f04c7ce3c5d74597 (diff) | |
| download | apk-tools-40f6720a3ffd448bd338412cf975befc71461abd.tar.gz apk-tools-40f6720a3ffd448bd338412cf975befc71461abd.tar.bz2 apk-tools-40f6720a3ffd448bd338412cf975befc71461abd.tar.xz apk-tools-40f6720a3ffd448bd338412cf975befc71461abd.zip | |
cache, upgrade: do not continue if repositories have issues
There are subtle issues where solving fails with --available,
and install_if rules if the repository indexes are not available.
Also it can be considered upgrade failure if index update failed.
Abort cache download, cache sync and upgrade operations early
in the above mentioned cases.
Also document side effects of --simulate that might affect upgrade.
fixes #10726, #10764
| -rw-r--r-- | doc/apk.8.scd | 5 | ||||
| -rw-r--r-- | src/app_cache.c | 10 | ||||
| -rw-r--r-- | src/app_upgrade.c | 4 |
3 files changed, 17 insertions, 2 deletions
diff --git a/doc/apk.8.scd b/doc/apk.8.scd index 3b5797e..1b9b6f3 100644 --- a/doc/apk.8.scd +++ b/doc/apk.8.scd @@ -179,7 +179,10 @@ The following options are available for all commands. The following options are available for all commands which commit the database. *-s, --simulate* - Simulate the requested operation without making any changes. + Simulate the requested operation without making any changes. The database + is opened in read only mode, and auto-updating of indexes is disabled. + You may want to run "apk update" before running a simulation to make sure + it is done with up-to-date repository indexes. *--clean-protected* Do not create .apk-new files in configuration directories. diff --git a/src/app_cache.c b/src/app_cache.c index 3a68938..09d9adf 100644 --- a/src/app_cache.c +++ b/src/app_cache.c @@ -198,11 +198,19 @@ static int cache_main(void *ctx, struct apk_database *db, struct apk_string_arra return -EINVAL; if (!apk_db_cache_active(db)) { - apk_error("Package cache is not enabled.\n"); + apk_error("Package cache is not enabled."); r = 2; goto err; } + if ((actions & CACHE_DOWNLOAD) && (cctx->solver_flags || cctx->add_dependencies)) { + if (db->repositories.stale || db->repositories.unavailable) { + apk_error("Not continuing due to stale/unavailable repositories."); + r = 3; + goto err; + } + } + if (r == 0 && (actions & CACHE_CLEAN)) r = cache_clean(db); if (r == 0 && (actions & CACHE_DOWNLOAD)) diff --git a/src/app_upgrade.c b/src/app_upgrade.c index 8645d21..bc6ccb1 100644 --- a/src/app_upgrade.c +++ b/src/app_upgrade.c @@ -163,6 +163,10 @@ static int upgrade_main(void *ctx, struct apk_database *db, struct apk_string_ar "Use --force-broken-world to override."); return -1; } + if (db->repositories.stale || db->repositories.unavailable) { + apk_error("Not continuing due to stale/unavailable repositories."); + return -1; + } solver_flags = APK_SOLVERF_UPGRADE | uctx->solver_flags; if (!uctx->no_self_upgrade && !args->num) { |