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/add.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/add.c') diff --git a/src/add.c b/src/add.c index 2afe834bba..f4d4413fc3 100644 --- a/src/add.c +++ b/src/add.c @@ -75,8 +75,8 @@ static int add_main(void *ctx, struct apk_database *db, int argc, char **argv) return -1; apk_blob_pull_dep(&b, db, &virtdep); - if (APK_BLOB_IS_NULL(b) || - virtdep.result_mask != APK_DEPMASK_REQUIRE || + if (APK_BLOB_IS_NULL(b) || virtdep.conflict || + virtdep.result_mask != APK_DEPMASK_ANY || virtdep.version != &apk_null_blob) { apk_error("%s: bad package specifier"); return -1; -- cgit v1.2.3