From f27f194d92c952da337205c0176f68a13f0cba7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Wed, 29 Feb 2012 08:53:43 +0200 Subject: solver, test: make conflicts unconditional Solver will now never report partial solution where a conflict constraint is not satisfied. The is because with --force we might install the partial solution; and if conflicted packages were to be installed we might have extra trouble. --- src/upgrade.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/upgrade.c') diff --git a/src/upgrade.c b/src/upgrade.c index 1185079a14..914f019274 100644 --- a/src/upgrade.c +++ b/src/upgrade.c @@ -114,7 +114,7 @@ static int upgrade_main(void *ctx, struct apk_database *db, int argc, char **arg for (i = 0; i < world->num; i++) { struct apk_dependency *dep = &world->item[i]; if (dep->result_mask == APK_DEPMASK_CHECKSUM) { - dep->result_mask = APK_DEPMASK_REQUIRE; + dep->result_mask = APK_DEPMASK_ANY; dep->version = apk_blob_atomize(APK_BLOB_NULL); } } -- cgit v1.2.3