X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fsolvable.c;h=8e9497634b1cf2773ca56099a507a4ca037ea325;hb=f4f0205fb83dc20d8091827942a408843f78f26d;hp=441af97910821ffdb59b1cd2c57a30c9f67409eb;hpb=7bdc9f122740d6e22056ffebcc00cb40190ff503;p=platform%2Fupstream%2Flibsolv.git

diff --git a/src/solvable.c b/src/solvable.c
index 441af97..8e94976 100644
--- a/src/solvable.c
+++ b/src/solvable.c
@@ -20,21 +20,56 @@
 #include "pool.h"
 #include "repo.h"
 #include "util.h"
+#include "policy.h"
+#include "poolvendor.h"
+#include "chksum.h"
+#include "linkedpkg.h"
 
 const char *
-solvable2str(Pool *pool, Solvable *s)
+pool_solvable2str(Pool *pool, Solvable *s)
 {
   const char *n, *e, *a;
+  int nl, el, al;
   char *p;
-  n = id2str(pool, s->name);
-  e = id2str(pool, s->evr);
-  a = id2str(pool, s->arch);
-  p = pool_alloctmpspace(pool, strlen(n) + strlen(e) + strlen(a) + 3);
-  sprintf(p, "%s-%s.%s", n, e, a);
+  n = pool_id2str(pool, s->name);
+  e = pool_id2str(pool, s->evr);
+  /* XXX: may want to skip the epoch here */
+  a = pool_id2str(pool, s->arch);
+  nl = strlen(n);
+  el = strlen(e);
+  al = strlen(a);
+  if (pool->havedistepoch)
+    {
+      /* strip the distepoch from the evr */
+      const char *de = strrchr(e, '-');
+      if (de && (de = strchr(de, ':')) != 0)
+	el = de - e;
+    }
+  p = pool_alloctmpspace(pool, nl + el + al + 3);
+  strcpy(p, n);
+  if (el)
+    {
+      p[nl++] = '-';
+      strncpy(p + nl, e, el);
+      p[nl + el] = 0;
+    }
+  if (al)
+    {
+      p[nl + el] = pool->disttype == DISTTYPE_HAIKU ? '-' : '.';
+      strcpy(p + nl + el + 1, a);
+    }
   return p;
 }
 
 Id
+solvable_lookup_type(Solvable *s, Id keyname)
+{
+  if (!s->repo)
+    return 0;
+  return repo_lookup_type(s->repo, s - s->repo->pool->solvables, keyname);
+}
+
+Id
 solvable_lookup_id(Solvable *s, Id keyname)
 {
   if (!s->repo)
@@ -45,32 +80,55 @@ solvable_lookup_id(Solvable *s, Id keyname)
 int
 solvable_lookup_idarray(Solvable *s, Id keyname, Queue *q)
 {
-  Dataiterator di;
-  int found = 0;
+  if (!s->repo)
+    {
+      queue_empty(q);
+      return 0;
+    }
+  return repo_lookup_idarray(s->repo, s - s->repo->pool->solvables, keyname, q);
+}
 
-  queue_empty(q);
+int
+solvable_lookup_deparray(Solvable *s, Id keyname, Queue *q, Id marker)
+{
   if (!s->repo)
-    return 0;
-  dataiterator_init(&di, s->repo->pool, s->repo, s - s->repo->pool->solvables, keyname, 0, SEARCH_ARRAYSENTINEL);
-  while (dataiterator_step(&di))
     {
-      if (di.key->type != REPOKEY_TYPE_IDARRAY && di.key->type != REPOKEY_TYPE_REL_IDARRAY)
-	continue;
-      found = 1;
-      if (di.kv.eof)
-	break;
-      queue_push(q, di.kv.id);
+      queue_empty(q);
+      return 0;
     }
-  dataiterator_free(&di);
-  return found;
+  return repo_lookup_deparray(s->repo, s - s->repo->pool->solvables, keyname, q, marker);
+}
+
+static const char *
+solvable_lookup_str_joinarray(Solvable *s, Id keyname, const char *joinstr)
+{
+  Queue q;
+  Id qbuf[10];
+  char *str = 0;
+
+  queue_init_buffer(&q, qbuf, sizeof(qbuf)/sizeof(*qbuf));
+  if (solvable_lookup_idarray(s, keyname, &q) && q.count)
+    {
+      Pool *pool = s->repo->pool;
+      int i;
+      str = pool_tmpjoin(pool, pool_id2str(pool, q.elements[0]), 0, 0);
+      for (i = 1; i < q.count; i++)
+	str = pool_tmpappend(pool, str, joinstr, pool_id2str(pool, q.elements[i]));
+    }
+  queue_free(&q);
+  return str;
 }
 
 const char *
 solvable_lookup_str(Solvable *s, Id keyname)
 {
+  const char *str;
   if (!s->repo)
     return 0;
-  return repo_lookup_str(s->repo, s - s->repo->pool->solvables, keyname);
+  str = repo_lookup_str(s->repo, s - s->repo->pool->solvables, keyname);
+  if (!str && (keyname == SOLVABLE_LICENSE || keyname == SOLVABLE_GROUP))
+    str = solvable_lookup_str_joinarray(s, keyname, ", ");
+  return str;
 }
 
 static const char *
@@ -78,7 +136,7 @@ solvable_lookup_str_base(Solvable *s, Id keyname, Id basekeyname, int usebase)
 {
   Pool *pool;
   const char *str, *basestr;
-  Id p, pp;
+  Id p, pp, name;
   Solvable *s2;
   int pass;
 
@@ -95,13 +153,14 @@ solvable_lookup_str_base(Solvable *s, Id keyname, Id basekeyname, int usebase)
    * translation */
   if (!pool->whatprovides)
     return usebase ? basestr : 0;
+  name = s->name;
   /* we do this in two passes, first same vendor, then all other vendors */
   for (pass = 0; pass < 2; pass++)
     {
-      FOR_PROVIDES(p, pp, s->name)
+      FOR_PROVIDES(p, pp, name)
 	{
 	  s2 = pool->solvables + p;
-	  if (s2->name != s->name)
+	  if (s2->name != name)
 	    continue;
 	  if ((s->vendor == s2->vendor) != (pass == 0))
 	    continue;
@@ -112,6 +171,20 @@ solvable_lookup_str_base(Solvable *s, Id keyname, Id basekeyname, int usebase)
 	  if (str)
 	    return str;
 	}
+#ifdef ENABLE_LINKED_PKGS
+      /* autopattern/product translation magic */
+      if (pass)
+	{
+	  const char *n = pool_id2str(pool, name);
+	  if (*n == 'p')
+	    {
+	      if (!strncmp("pattern:", n, 8) && (name = find_autopattern_name(pool, s)) != 0)
+		pass = -1;
+	      if (!strncmp("product:", n, 8) && (name = find_autoproduct_name(pool, s)) != 0)
+		pass = -1;
+	    }
+	}
+#endif
     }
   return usebase ? basestr : 0;
 }
@@ -132,7 +205,7 @@ solvable_lookup_str_poollang(Solvable *s, Id keyname)
   cols = pool->nlanguages + 1;
   if (!pool->languagecache)
     {
-      pool->languagecache = sat_calloc(cols * ID_NUM_INTERNAL, sizeof(Id));
+      pool->languagecache = solv_calloc(cols * ID_NUM_INTERNAL, sizeof(Id));
       pool->languagecacheother = 0;
     }
   if (keyname >= ID_NUM_INTERNAL)
@@ -143,7 +216,7 @@ solvable_lookup_str_poollang(Solvable *s, Id keyname)
 	  break;
       if (i >= pool->languagecacheother)
 	{
-	  pool->languagecache = sat_realloc2(pool->languagecache, pool->languagecacheother + 1, cols * sizeof(Id));
+	  pool->languagecache = solv_realloc2(pool->languagecache, pool->languagecacheother + 1, cols * sizeof(Id));
 	  row = pool->languagecache + cols * (ID_NUM_INTERNAL + pool->languagecacheother++);
 	  *row = keyname;
 	}
@@ -176,14 +249,24 @@ solvable_lookup_str_lang(Solvable *s, Id keyname, const char *lang, int usebase)
   return solvable_lookup_str(s, keyname);
 }
 
-unsigned int
-solvable_lookup_num(Solvable *s, Id keyname, unsigned int notfound)
+unsigned long long
+solvable_lookup_num(Solvable *s, Id keyname, unsigned long long notfound)
 {
   if (!s->repo)
-    return 0;
+    return notfound;
   return repo_lookup_num(s->repo, s - s->repo->pool->solvables, keyname, notfound);
 }
 
+unsigned int
+solvable_lookup_sizek(Solvable *s, Id keyname, unsigned int notfound)
+{
+  unsigned long long size;
+  if (!s->repo)
+    return notfound;
+  size = solvable_lookup_num(s, keyname, (unsigned long long)notfound << 10);
+  return (unsigned int)((size + 1023) >> 10);
+}
+
 int
 solvable_lookup_void(Solvable *s, Id keyname)
 {
@@ -195,37 +278,12 @@ solvable_lookup_void(Solvable *s, Id keyname)
 int
 solvable_lookup_bool(Solvable *s, Id keyname)
 {
-  Repo *repo = s->repo;
-  Pool *pool;
-  Repodata *data;
-  int i, j, n;
-
-  if (!repo)
+  if (!s->repo)
     return 0;
-  pool = repo->pool;
-  n = s - pool->solvables;
-  for (i = 0, data = repo->repodata; i < repo->nrepodata; i++, data++)
-    {
-      if (n < data->start || n >= data->end)
-        continue;
-      /* there are two ways of storing a bool, as num == 1 or void */
-      for (j = 1; j < data->nkeys; j++)
-        {
-          if (data->keys[j].name == keyname
-              && (data->keys[j].type == REPOKEY_TYPE_U32
-                  || data->keys[j].type == REPOKEY_TYPE_NUM
-                  || data->keys[j].type == REPOKEY_TYPE_CONSTANT
-                  || data->keys[j].type == REPOKEY_TYPE_VOID))
-            {
-              unsigned int value;
-              if (repodata_lookup_num(data, n, keyname, &value))
-                return value == 1;
-              if (repodata_lookup_void(data, n, keyname))
-                return 1;
-            }
-        }
-    }
-  return 0;
+  /* historic nonsense: there are two ways of storing a bool, as num == 1 or void. test both. */
+  if (repo_lookup_type(s->repo, s - s->repo->pool->solvables, keyname) == REPOKEY_TYPE_VOID)
+    return 1;
+  return repo_lookup_num(s->repo, s - s->repo->pool->solvables, keyname, 0) == 1;
 }
 
 const unsigned char *
@@ -245,36 +303,37 @@ const char *
 solvable_lookup_checksum(Solvable *s, Id keyname, Id *typep)
 {
   const unsigned char *chk = solvable_lookup_bin_checksum(s, keyname, typep);
-  /* we need the repodata just as a reference for a pool */
-  return chk ? repodata_chk2str(s->repo->repodata, *typep, chk) : 0;
+  return chk ? pool_bin2hex(s->repo->pool, chk, solv_chksum_len(*typep)) : 0;
 }
 
 static inline const char *
 evrid2vrstr(Pool *pool, Id evrid)
 {
-  const char *p, *evr = id2str(pool, evrid);
+  const char *p, *evr = pool_id2str(pool, evrid);
   if (!evr)
     return evr;
   for (p = evr; *p >= '0' && *p <= '9'; p++)
     ;
-  return p != evr && *p == ':' ? p + 1 : evr;
+  return p != evr && *p == ':' && p[1] ? p + 1 : evr;
 }
 
-char *
-solvable_get_location(Solvable *s, unsigned int *medianrp)
+const char *
+solvable_lookup_location(Solvable *s, unsigned int *medianrp)
 {
   Pool *pool;
   int l = 0;
   char *loc;
   const char *mediadir, *mediafile;
 
-  *medianrp = 0;
+  if (medianrp)
+    *medianrp = 0;
   if (!s->repo)
     return 0;
   pool = s->repo->pool;
-  *medianrp = solvable_lookup_num(s, SOLVABLE_MEDIANR, 1);
+  if (medianrp)
+    *medianrp = solvable_lookup_num(s, SOLVABLE_MEDIANR, 0);
   if (solvable_lookup_void(s, SOLVABLE_MEDIADIR))
-    mediadir = id2str(pool, s->arch);
+    mediadir = pool_id2str(pool, s->arch);
   else
     mediadir = solvable_lookup_str(s, SOLVABLE_MEDIADIR);
   if (mediadir)
@@ -282,9 +341,9 @@ solvable_get_location(Solvable *s, unsigned int *medianrp)
   if (solvable_lookup_void(s, SOLVABLE_MEDIAFILE))
     {
       const char *name, *evr, *arch;
-      name = id2str(pool, s->name);
+      name = pool_id2str(pool, s->name);
       evr = evrid2vrstr(pool, s->evr);
-      arch = id2str(pool, s->arch);
+      arch = pool_id2str(pool, s->arch);
       /* name-vr.arch.rpm */
       loc = pool_alloctmpspace(pool, l + strlen(name) + strlen(evr) + strlen(arch) + 7);
       if (mediadir)
@@ -306,25 +365,91 @@ solvable_get_location(Solvable *s, unsigned int *medianrp)
   return loc;
 }
 
+const char *
+solvable_get_location(Solvable *s, unsigned int *medianrp)
+{
+  const char *loc = solvable_lookup_location(s, medianrp);
+  if (medianrp && *medianrp == 0)
+    *medianrp = 1;	/* compat, to be removed */
+  return loc;
+}
+
+const char *
+solvable_lookup_sourcepkg(Solvable *s)
+{
+  Pool *pool;
+  const char *evr, *name;
+  Id archid;
+
+  if (!s->repo)
+    return 0;
+  pool = s->repo->pool;
+  if (solvable_lookup_void(s, SOLVABLE_SOURCENAME))
+    name = pool_id2str(pool, s->name);
+  else
+    name = solvable_lookup_str(s, SOLVABLE_SOURCENAME);
+  if (!name)
+    return 0;
+  archid = solvable_lookup_id(s, SOLVABLE_SOURCEARCH);
+  if (solvable_lookup_void(s, SOLVABLE_SOURCEEVR))
+    evr = evrid2vrstr(pool, s->evr);
+  else
+    evr = solvable_lookup_str(s, SOLVABLE_SOURCEEVR);
+  if (archid == ARCH_SRC || archid == ARCH_NOSRC)
+    {
+      char *str;
+      str = pool_tmpjoin(pool, name, evr ? "-" : 0, evr);
+      str = pool_tmpappend(pool, str, ".", pool_id2str(pool, archid));
+      return pool_tmpappend(pool, str, ".rpm", 0);
+    }
+  else
+    return name;	/* FIXME */
+}
+
+
 /*****************************************************************************/
 
 static inline Id dep2name(Pool *pool, Id dep)
 {
   while (ISRELDEP(dep))
     {
-      Reldep *rd = rd = GETRELDEP(pool, dep);
+      Reldep *rd = GETRELDEP(pool, dep);
       dep = rd->name;
     }
   return dep;
 }
 
-static inline int providedbyinstalled(Pool *pool, Map *installed, Id dep)
+static int providedbyinstalled_multiversion(Pool *pool, Map *installed, Id n, Id con)
+{
+  Id p, pp;
+  Solvable *sn = pool->solvables + n;
+
+  FOR_PROVIDES(p, pp, sn->name)
+    {
+      Solvable *s = pool->solvables + p;
+      if (s->name != sn->name || s->arch != sn->arch)
+        continue;
+      if (!MAPTST(installed, p))
+        continue;
+      if (pool_match_nevr(pool, pool->solvables + p, con))
+        continue;
+      return 1;         /* found installed package that doesn't conflict */
+    }
+  return 0;
+}
+
+static inline int providedbyinstalled(Pool *pool, Map *installed, Id dep, int ispatch, Map *multiversionmap)
 {
   Id p, pp;
   FOR_PROVIDES(p, pp, dep)
     {
       if (p == SYSTEMSOLVABLE)
 	return -1;
+      if (ispatch && !pool_match_nevr(pool, pool->solvables + p, dep))
+	continue;
+      if (ispatch && multiversionmap && multiversionmap->size && MAPTST(multiversionmap, p) && ISRELDEP(dep))
+	if (providedbyinstalled_multiversion(pool, installed, p, dep))
+	  continue;
       if (MAPTST(installed, p))
 	return 1;
     }
@@ -348,14 +473,13 @@ static inline int providedbyinstalled(Pool *pool, Map *installed, Id dep)
  * -1: solvable is installable, but doesn't constrain any installed packages
  */
 int
-solvable_trivial_installable_map(Solvable *s, Map *installedmap, Map *conflictsmap)
+solvable_trivial_installable_map(Solvable *s, Map *installedmap, Map *conflictsmap, Map *multiversionmap)
 {
   Pool *pool = s->repo->pool;
   Solvable *s2;
-  Id p, pp, *dp;
+  Id p, *dp;
   Id *reqp, req;
   Id *conp, con;
-  Id *obsp, obs;
   int r, interesting = 0;
 
   if (conflictsmap && MAPTST(conflictsmap, s - pool->solvables))
@@ -367,7 +491,7 @@ solvable_trivial_installable_map(Solvable *s, Map *installedmap, Map *conflictsm
 	{
 	  if (req == SOLVABLE_PREREQMARKER)
 	    continue;
-          r = providedbyinstalled(pool, installedmap, req);
+          r = providedbyinstalled(pool, installedmap, req, 0, 0);
 	  if (!r)
 	    return 0;
 	  if (r > 0)
@@ -376,33 +500,46 @@ solvable_trivial_installable_map(Solvable *s, Map *installedmap, Map *conflictsm
     }
   if (s->conflicts)
     {
+      int ispatch = 0;
+
+      if (!strncmp("patch:", pool_id2str(pool, s->name), 6))
+	ispatch = 1;
       conp = s->repo->idarraydata + s->conflicts;
       while ((con = *conp++) != 0)
 	{
-	  if (providedbyinstalled(pool, installedmap, con))
-	    return 0;
+	  if (providedbyinstalled(pool, installedmap, con, ispatch, multiversionmap))
+	    {
+	      if (ispatch && solvable_is_irrelevant_patch(s, installedmap))
+		return -1;
+	      return 0;
+	    }
 	  if (!interesting && ISRELDEP(con))
 	    {
               con = dep2name(pool, con);
-	      if (providedbyinstalled(pool, installedmap, con))
+	      if (providedbyinstalled(pool, installedmap, con, ispatch, multiversionmap))
 		interesting = 1;
 	    }
 	}
+      if (ispatch && interesting && solvable_is_irrelevant_patch(s, installedmap))
+	interesting = 0;
     }
+#if 0
   if (s->repo)
     {
+      Id *obsp, obs;
       Repo *installed = 0;
       if (s->obsoletes && s->repo != installed)
 	{
 	  obsp = s->repo->idarraydata + s->obsoletes;
 	  while ((obs = *obsp++) != 0)
 	    {
-	      if (providedbyinstalled(pool, installedmap, obs))
+	      if (providedbyinstalled(pool, installedmap, obs, 0, 0))
 		return 0;
 	    }
 	}
       if (s->repo != installed)
 	{
+	  Id pp;
 	  FOR_PROVIDES(p, pp, s->name)
 	    {
 	      s2 = pool->solvables + p;
@@ -411,6 +548,7 @@ solvable_trivial_installable_map(Solvable *s, Map *installedmap, Map *conflictsm
 	    }
 	}
     }
+#endif
   if (!conflictsmap)
     {
       int i;
@@ -442,7 +580,7 @@ solvable_trivial_installable_map(Solvable *s, Map *installedmap, Map *conflictsm
  * by a queue.
  */
 int
-solvable_trivial_installable_queue(Solvable *s, Queue *installed)
+solvable_trivial_installable_queue(Solvable *s, Queue *installed, Map *multiversionmap)
 {
   Pool *pool = s->repo->pool;
   int i;
@@ -457,7 +595,7 @@ solvable_trivial_installable_queue(Solvable *s, Queue *installed)
       if (p > 0)		/* makes it work with decisionq */
 	MAPSET(&installedmap, p);
     }
-  r = solvable_trivial_installable_map(s, &installedmap, 0);
+  r = solvable_trivial_installable_map(s, &installedmap, 0, multiversionmap);
   map_free(&installedmap);
   return r;
 }
@@ -468,7 +606,7 @@ solvable_trivial_installable_queue(Solvable *s, Queue *installed)
  * by a repo containing the installed solvables.
  */
 int
-solvable_trivial_installable_repo(Solvable *s, Repo *installed)
+solvable_trivial_installable_repo(Solvable *s, Repo *installed, Map *multiversionmap)
 {
   Pool *pool = s->repo->pool;
   Id p;
@@ -479,18 +617,95 @@ solvable_trivial_installable_repo(Solvable *s, Repo *installed)
   map_init(&installedmap, pool->nsolvables);
   FOR_REPO_SOLVABLES(installed, p, s2)
     MAPSET(&installedmap, p);
-  r = solvable_trivial_installable_map(s, &installedmap, 0);
+  r = solvable_trivial_installable_map(s, &installedmap, 0, multiversionmap);
   map_free(&installedmap);
   return r;
 }
 
+/* FIXME: this mirrors policy_illegal_vendorchange */
+static int
+pool_illegal_vendorchange(Pool *pool, Solvable *s1, Solvable *s2)
+{
+  Id v1, v2;
+  Id vendormask1, vendormask2;
+
+  if (pool->custom_vendorcheck)
+    return pool->custom_vendorcheck(pool, s1, s2);
+  /* treat a missing vendor as empty string */
+  v1 = s1->vendor ? s1->vendor : ID_EMPTY;
+  v2 = s2->vendor ? s2->vendor : ID_EMPTY;
+  if (v1 == v2)
+    return 0;
+  vendormask1 = pool_vendor2mask(pool, v1);
+  if (!vendormask1)
+    return 1;   /* can't match */
+  vendormask2 = pool_vendor2mask(pool, v2);
+  if ((vendormask1 & vendormask2) != 0)
+    return 0;
+  return 1;     /* no class matches */
+}
+
+/* check if this patch is relevant according to the vendor. To bad that patches
+ * don't have a vendor, so we need to do some careful repo testing. */
+int
+solvable_is_irrelevant_patch(Solvable *s, Map *installedmap)
+{
+  Pool *pool = s->repo->pool;
+  Id con, *conp;
+  int hadpatchpackage = 0;
+
+  if (!s->conflicts)
+    return 0;
+  conp = s->repo->idarraydata + s->conflicts;
+  while ((con = *conp++) != 0)
+    {
+      Reldep *rd;
+      Id p, pp, p2, pp2;
+      if (!ISRELDEP(con))
+	continue;
+      rd = GETRELDEP(pool, con);
+      if (rd->flags != REL_LT)
+	continue;
+      FOR_PROVIDES(p, pp, con)
+	{
+	  Solvable *si;
+	  if (!MAPTST(installedmap, p))
+	    continue;
+	  si = pool->solvables + p;
+	  if (!pool_match_nevr(pool, si, con))
+	    continue;
+	  FOR_PROVIDES(p2, pp2, rd->name)
+	    {
+	      Solvable *s2 = pool->solvables + p2;
+	      if (!pool_match_nevr(pool, s2, rd->name))
+		continue;
+	      if (pool_match_nevr(pool, s2, con))
+		continue;	/* does not fulfill patch */
+	      if (s2->repo == s->repo)
+		{
+		  hadpatchpackage = 1;
+		  /* ok, we have a package from the patch repo that solves the conflict. check vendor */
+		  if (si->vendor == s2->vendor)
+		    return 0;
+		  if (!pool_illegal_vendorchange(pool, si, s2))
+		    return 0;
+		  /* vendor change was illegal, ignore conflict */
+		}
+	    }
+	}
+    }
+  /* if we didn't find a patchpackage don't claim that the patch is irrelevant */
+  if (!hadpatchpackage)
+    return 0;
+  return 1;
+}
 
 /*****************************************************************************/
 
 /*
  * Create maps containing the state of each solvable. Input is a "installed" queue,
  * it contains all solvable ids that are considered to be installed.
- * 
+ *
  * The created maps can be used for solvable_trivial_installable_map(),
  * pool_calc_duchanges(), pool_calc_installsizechange().
  *
@@ -528,8 +743,8 @@ pool_create_state_maps(Pool *pool, Queue *installed, Map *installedmap, Map *con
 }
 
 /* Tests if two solvables have identical content. Currently
- * both solvables need to come from the same pool */
-
+ * both solvables need to come from the same pool
+ */
 int
 solvable_identical(Solvable *s1, Solvable *s2)
 {
@@ -562,10 +777,10 @@ solvable_identical(Solvable *s1, Solvable *s2)
       rq1 = rq2 = 0;
       if (s1->requires)
 	for (reqp = s1->repo->idarraydata + s1->requires; *reqp; reqp++)
-	  rq1 ^= *reqp++;
+	  rq1 ^= *reqp;
       if (s2->requires)
 	for (reqp = s2->repo->idarraydata + s2->requires; *reqp; reqp++)
-	  rq2 ^= *reqp++;
+	  rq2 ^= *reqp;
       if (rq1 != rq2)
 	 return 0;
     }
@@ -595,5 +810,83 @@ solvable_selfprovidedep(Solvable *s)
 	    return prov;
 	}
     }
-  return rel2id(pool, s->name, s->evr, REL_EQ, 1);
+  return pool_rel2id(pool, s->name, s->evr, REL_EQ, 1);
+}
+
+/* setter functions, simply call the repo variants */
+void
+solvable_set_id(Solvable *s, Id keyname, Id id)
+{
+  repo_set_id(s->repo, s - s->repo->pool->solvables, keyname, id);
+}
+
+void
+solvable_set_num(Solvable *s, Id keyname, unsigned long long num)
+{
+  repo_set_num(s->repo, s - s->repo->pool->solvables, keyname, num);
+}
+
+void
+solvable_set_str(Solvable *s, Id keyname, const char *str)
+{
+  repo_set_str(s->repo, s - s->repo->pool->solvables, keyname, str);
+}
+
+void
+solvable_set_poolstr(Solvable *s, Id keyname, const char *str)
+{
+  repo_set_poolstr(s->repo, s - s->repo->pool->solvables, keyname, str);
+}
+
+void
+solvable_add_poolstr_array(Solvable *s, Id keyname, const char *str)
+{
+  repo_add_poolstr_array(s->repo, s - s->repo->pool->solvables, keyname, str);
+}
+
+void
+solvable_add_idarray(Solvable *s, Id keyname, Id id)
+{
+  repo_add_idarray(s->repo, s - s->repo->pool->solvables, keyname, id);
+}
+
+void
+solvable_add_deparray(Solvable *s, Id keyname, Id dep, Id marker)
+{
+  repo_add_deparray(s->repo, s - s->repo->pool->solvables, keyname, dep, marker);
+}
+
+void
+solvable_set_idarray(Solvable *s, Id keyname, Queue *q)
+{
+  repo_set_idarray(s->repo, s - s->repo->pool->solvables, keyname, q);
+}
+
+void
+solvable_set_deparray(Solvable *s, Id keyname, Queue *q, Id marker)
+{
+  repo_set_deparray(s->repo, s - s->repo->pool->solvables, keyname, q, marker);
+}
+
+void
+solvable_unset(Solvable *s, Id keyname)
+{
+  repo_unset(s->repo, s - s->repo->pool->solvables, keyname);
+}
+
+/* return true if a dependency intersects dep in the keyname array */
+int
+solvable_matchesdep(Solvable *s, Id keyname, Id dep, int marker)
+{
+  int i;
+  Pool *pool = s->repo->pool;
+  Queue q;
+  queue_init(&q);
+  solvable_lookup_deparray(s, keyname, &q, marker);
+  for (i = 0; i < q.count; i++)
+    if (pool_match_dep(pool, q.elements[i], dep))
+      break;
+  i = i == q.count ? 0 : 1;
+  queue_free(&q);
+  return i;
 }