From e682e6596c101d634b3780a98773c8433b3baadb Mon Sep 17 00:00:00 2001 From: Timo Teräs Date: Fri, 21 Oct 2011 15:24:24 -0400 Subject: 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. --- src/del.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/del.c') 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) -- cgit v1.2.3-60-g2f50