From f27f194d92c952da337205c0176f68a13f0cba7c Mon Sep 17 00:00:00 2001 From: Timo Teräs 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/apk_version.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/apk_version.h') diff --git a/src/apk_version.h b/src/apk_version.h index 2afd7b0..dcbf20f 100644 --- a/src/apk_version.h +++ b/src/apk_version.h @@ -18,8 +18,7 @@ #define APK_VERSION_LESS 2 #define APK_VERSION_GREATER 4 -#define APK_DEPMASK_CONFLICT (0) -#define APK_DEPMASK_REQUIRE (APK_VERSION_EQUAL|APK_VERSION_LESS|\ +#define APK_DEPMASK_ANY (APK_VERSION_EQUAL|APK_VERSION_LESS|\ APK_VERSION_GREATER) #define APK_DEPMASK_CHECKSUM (APK_VERSION_LESS|APK_VERSION_GREATER) -- cgit v1.2.3-70-g09d2