From b3df78ed03b3739d01220f9bf2f00ab8df61425f Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Tue, 17 Jan 2012 14:46:39 +0200 Subject: solver, upgrade: properly detect missing repository tags * upgrade needs explicit check so we don't try self-upgrade (which would print additional messages on screen) * add can fix problems, so check against the new world * merge the code in few places --- src/solver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/solver.c') diff --git a/src/solver.c b/src/solver.c index 959e56f..76edeba 100644 --- a/src/solver.c +++ b/src/solver.c @@ -1328,7 +1328,7 @@ int apk_solver_commit_changeset(struct apk_database *db, struct apk_change *change; int i, r = 0, size_diff = 0; - if (db->missing_tags && !(apk_flags & APK_FORCE)) { + if (apk_db_check_world(db, world) != 0) { apk_error("Not committing changes due to missing repository tags. Use --force to override."); return -1; } @@ -1478,7 +1478,7 @@ int apk_solver_commit(struct apk_database *db, struct apk_package_array *solution = NULL; int r; - if (db->missing_tags && !(apk_flags & APK_FORCE)) { + if (apk_db_check_world(db, world) != 0) { apk_error("Not committing changes due to missing repository tags. Use --force to override."); return -1; } -- cgit v1.2.3-60-g2f50