summaryrefslogtreecommitdiff
path: root/src/del.c
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/del.c
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/del.c')
-rw-r--r--src/del.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/del.c b/src/del.c
index 3d7ffe7..ffa924f 100644
--- a/src/del.c
+++ b/src/del.c
@@ -58,8 +58,7 @@ static void foreach_installed_reverse_dependency(
for (k = 0; k < pkg0->depends->num; k++) {
struct apk_dependency *dep = &pkg0->depends->item[k];
if (dep->name == name &&
- (dep->result_mask == APK_DEPMASK_CONFLICT ||
- apk_dep_is_satisfied(dep, pkg)))
+ apk_dep_is_satisfied(dep, pkg))
break;
}
if (k >= pkg0->depends->num)