Merge pull request #592 from kontura/dep_fulfilled

Add pool_dep_fulfilled_in_map function

Author: mlschroe

doc/libsolv-pool.txt

@@ -562,6 +562,10 @@ by the ``evr'' parts must overlap.
 Like pool_match_dep, but the provider is the "self-provides" dependency
 of the Solvable _s_, i.e. the dependency ``s->name = s->evr''.
 
+        int pool_dep_fulfilled_in_map(Pool *pool, const Map *map, Id dep);
+
+Returns ``1'' if the dependency _dep_ is provided by at least one package
+from _map_, otherwise ``0'' is returned.
 
 Whatprovides Index
 ------------------

src/libsolv.ver

@@ -91,6 +91,7 @@ SOLV_1.0 {
 		pool_lookup_str;
 		pool_lookup_void;
 		pool_match_dep;
+		pool_dep_fulfilled_in_map;
 		pool_match_nevr_rel;
 		pool_prepend_rootdir;
 		pool_prepend_rootdir_tmp;

src/pool.c

@@ -754,4 +754,74 @@ int (*pool_get_custom_vendorcheck(Pool *pool))(Pool *, Solvable *, Solvable *)
   return pool->custom_vendorcheck;
 }
 
+static int
+pool_dep_fulfilled_in_map_cplx(Pool *pool, const Map *map, Reldep *rd)
+{
+  if (rd->flags == REL_COND)
+    {
+      if (ISRELDEP(rd->evr))
+	{
+	  Reldep *rd2 = GETRELDEP(pool, rd->evr);
+	  if (rd2->flags == REL_ELSE)
+	    {
+	      if (pool_dep_fulfilled_in_map(pool, map, rd2->name))
+		return pool_dep_fulfilled_in_map(pool, map, rd->name);
+	      return pool_dep_fulfilled_in_map(pool, map, rd2->evr);
+	    }
+	}
+      if (pool_dep_fulfilled_in_map(pool, map, rd->name))
+	return 1;
+      return !pool_dep_fulfilled_in_map(pool, map, rd->evr);
+    }
+  if (rd->flags == REL_UNLESS)
+    {
+      if (ISRELDEP(rd->evr))
+	{
+	  Reldep *rd2 = GETRELDEP(pool, rd->evr);
+	  if (rd2->flags == REL_ELSE)
+	    {
+	      if (!pool_dep_fulfilled_in_map(pool, map, rd2->name))
+		return pool_dep_fulfilled_in_map(pool, map, rd->name);
+	      return pool_dep_fulfilled_in_map(pool, map, rd2->evr);
+	    }
+	}
+      if (!pool_dep_fulfilled_in_map(pool, map, rd->name))
+	return 0;
+      return !pool_dep_fulfilled_in_map(pool, map, rd->evr);
+    }
+  if (rd->flags == REL_AND)
+    {
+      if (!pool_dep_fulfilled_in_map(pool, map, rd->name))
+	return 0;
+      return pool_dep_fulfilled_in_map(pool, map, rd->evr);
+    }
+  if (rd->flags == REL_OR)
+    {
+      if (pool_dep_fulfilled_in_map(pool, map, rd->name))
+	return 1;
+      return pool_dep_fulfilled_in_map(pool, map, rd->evr);
+    }
+  return 0;
+}
+
+
+int pool_dep_fulfilled_in_map(Pool *pool, const Map *map, Id dep)
+{
+  Id p, pp;
+
+  if (ISRELDEP(dep)) {
+    Reldep *rd = GETRELDEP(pool, dep);
+    if (rd->flags == REL_COND || rd->flags == REL_UNLESS ||
+        rd->flags == REL_AND || rd->flags == REL_OR)
+      return pool_dep_fulfilled_in_map_cplx(pool, map, rd);
+    if (rd->flags == REL_NAMESPACE && rd->name == NAMESPACE_SPLITPROVIDES)
+      return 0;
+  }
+  FOR_PROVIDES(p, pp, dep) {
+    if (MAPTST(map, p))
+      return 1;
+  }
+  return 0;
+}
+
 /* EOF */

src/pool.h

@@ -305,6 +305,7 @@ Id pool_id2langid(Pool *pool, Id id, const char *lang, int create);
 
 int pool_intersect_evrs(Pool *pool, int pflags, Id pevr, int flags, Id evr);
 int pool_match_dep(Pool *pool, Id d1, Id d2);
+int pool_dep_fulfilled_in_map(Pool *pool, const Map *map, Id dep);
 
 /* semi private, used in pool_match_nevr */
 int pool_match_nevr_rel(Pool *pool, Solvable *s, Id d);