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.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/add.c b/src/add.c
index 2afe834..f4d4413 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;