diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-06-12 17:00:43 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-06-13 18:22:00 +0300 |
| commit | 25ff68a87e3264b6dfdc846823d4912b4dd870b2 (patch) | |
| tree | cd0d63eba30d233f52d5bed6e8a89cb64bf7de82 /src/upgrade.c | |
| parent | 59678309ea7350a159a3f5ee61c2fb5218dee6d5 (diff) | |
| download | apk-tools-25ff68a87e3264b6dfdc846823d4912b4dd870b2.tar.gz apk-tools-25ff68a87e3264b6dfdc846823d4912b4dd870b2.tar.bz2 apk-tools-25ff68a87e3264b6dfdc846823d4912b4dd870b2.tar.xz apk-tools-25ff68a87e3264b6dfdc846823d4912b4dd870b2.zip | |
solver: prune broken world dependencies with --force
mostly useful for reboot, when all packages are not available.
Diffstat (limited to 'src/upgrade.c')
| -rw-r--r-- | src/upgrade.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/upgrade.c b/src/upgrade.c index 60b19ec..8c8284d 100644 --- a/src/upgrade.c +++ b/src/upgrade.c @@ -53,10 +53,7 @@ int apk_do_self_upgrade(struct apk_database *db, unsigned short solver_flags) r = apk_solver_solve(db, 0, db->world, &changeset); if (r != 0) { - if ((r > 0) && (apk_flags & APK_FORCE)) - r = 0; - else - apk_solver_print_errors(db, &changeset, db->world); + apk_solver_print_errors(db, &changeset, db->world); goto ret; } |