diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2012-02-29 08:53:43 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2012-02-29 08:53:43 +0200 |
| commit | f27f194d92c952da337205c0176f68a13f0cba7c (patch) | |
| tree | ac6d7d92c024589003b7e30493ad0d3ff0662c0d /src/apk_version.h | |
| parent | 2e8fe783a11bcd6ccc7f1a08d8b38eb76d87dc35 (diff) | |
| download | apk-tools-f27f194d92c952da337205c0176f68a13f0cba7c.tar.gz apk-tools-f27f194d92c952da337205c0176f68a13f0cba7c.tar.bz2 apk-tools-f27f194d92c952da337205c0176f68a13f0cba7c.tar.xz apk-tools-f27f194d92c952da337205c0176f68a13f0cba7c.zip | |
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.
Diffstat (limited to 'src/apk_version.h')
| -rw-r--r-- | src/apk_version.h | 3 |
1 files changed, 1 insertions, 2 deletions
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) |