summaryrefslogtreecommitdiff
path: root/src/apk_version.h
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2011-10-21 15:24:24 -0400
committerTimo Teräs <timo.teras@iki.fi>2011-10-24 10:16:40 -0400
commite682e6596c101d634b3780a98773c8433b3baadb (patch)
treec5f5ec848d972555fafc2333f72182734dd7df5b /src/apk_version.h
parentbd0242e1de1c21d4d58cfd86e98b223b6e3e7e12 (diff)
downloadapk-tools-e682e6596c101d634b3780a98773c8433b3baadb.tar.gz
apk-tools-e682e6596c101d634b3780a98773c8433b3baadb.tar.bz2
apk-tools-e682e6596c101d634b3780a98773c8433b3baadb.tar.xz
apk-tools-e682e6596c101d634b3780a98773c8433b3baadb.zip
solver, pkg: implement versioned conflicts
One can now say in dependency "!foo<2" which means, that if foo is installed, it needs to be >=2, but it's not a required dependency.
Diffstat (limited to 'src/apk_version.h')
-rw-r--r--src/apk_version.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/apk_version.h b/src/apk_version.h
index 8c264e6..514fea9 100644
--- a/src/apk_version.h
+++ b/src/apk_version.h
@@ -21,7 +21,6 @@
#define APK_DEPMASK_REQUIRE (APK_VERSION_EQUAL|APK_VERSION_LESS|\
APK_VERSION_GREATER)
#define APK_DEPMASK_CHECKSUM (APK_VERSION_LESS|APK_VERSION_GREATER)
-#define APK_DEPMASK_CONFLICT (0)
const char *apk_version_op_string(int result_mask);
int apk_version_result_mask(const char *str);