X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fpool.c;h=72e22f8ccc31597d31803fe98a077cc63c5d86da;hb=refs%2Fchanges%2F22%2F94122%2F1;hp=c51c62eca9d43c8263fe70ab807d99cc3fe8d86f;hpb=8fcc0d8e03716077d1f2c2ca79fc622880a32196;p=platform%2Fupstream%2Flibsolv.git

diff --git a/src/pool.c b/src/pool.c
index c51c62e..72e22f8 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -1681,224 +1681,6 @@ pool_bin2hex(Pool *pool, const unsigned char *buf, int len)
   return s;
 }
 
-/* map:
- *  1: installed
- *  2: conflicts with installed
- *  8: interesting (only true if installed)
- * 16: undecided
- */
-
-static inline Id dep2name(Pool *pool, Id dep)
-{
-  while (ISRELDEP(dep))
-    {
-      Reldep *rd = GETRELDEP(pool, dep);
-      dep = rd->name;
-    }
-  return dep;
-}
-
-static int providedbyinstalled_multiversion(Pool *pool, unsigned char *map, 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 ((map[p] & 9) != 9)
-        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, unsigned char *map, Id dep, int ispatch, Map *multiversionmap)
-{
-  Id p, pp;
-  int r = 0;
-  FOR_PROVIDES(p, pp, dep)
-    {
-      if (p == SYSTEMSOLVABLE)
-        return 1;	/* always boring, as never constraining */
-      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, map, p, dep))
-	  continue;
-      if ((map[p] & 9) == 9)
-	return 9;
-      r |= map[p] & 17;
-    }
-  return r;
-}
-
-/*
- * pool_trivial_installable - calculate if a set of solvables is
- * trivial installable without any other installs/deinstalls of
- * packages not belonging to the set.
- *
- * the state is returned in the result queue:
- * 1:  solvable is installable without any other package changes
- * 0:  solvable is not installable
- * -1: solvable is installable, but doesn't constrain any installed packages
- */
-
-void
-pool_trivial_installable_multiversionmap(Pool *pool, Map *installedmap, Queue *pkgs, Queue *res, Map *multiversionmap)
-{
-  int i, r, m, did;
-  Id p, *dp, con, *conp, req, *reqp;
-  unsigned char *map;
-  Solvable *s;
-
-  map = solv_calloc(pool->nsolvables, 1);
-  for (p = 1; p < pool->nsolvables; p++)
-    {
-      if (!MAPTST(installedmap, p))
-	continue;
-      map[p] |= 9;
-      s = pool->solvables + p;
-      if (!s->conflicts)
-	continue;
-      conp = s->repo->idarraydata + s->conflicts;
-      while ((con = *conp++) != 0)
-	{
-	  dp = pool_whatprovides_ptr(pool, con);
-	  for (; *dp; dp++)
-	    map[p] |= 2;	/* XXX: self conflict ? */
-	}
-    }
-  for (i = 0; i < pkgs->count; i++)
-    map[pkgs->elements[i]] = 16;
-
-  for (i = 0, did = 0; did < pkgs->count; i++, did++)
-    {
-      if (i == pkgs->count)
-	i = 0;
-      p = pkgs->elements[i];
-      if ((map[p] & 16) == 0)
-	continue;
-      if ((map[p] & 2) != 0)
-	{
-	  map[p] = 2;
-	  continue;
-	}
-      s = pool->solvables + p;
-      m = 1;
-      if (s->requires)
-	{
-	  reqp = s->repo->idarraydata + s->requires;
-	  while ((req = *reqp++) != 0)
-	    {
-	      if (req == SOLVABLE_PREREQMARKER)
-		continue;
-	      r = providedbyinstalled(pool, map, req, 0, 0);
-	      if (!r)
-		{
-		  /* decided and miss */
-		  map[p] = 2;
-		  did = 0;
-		  break;
-		}
-	      if (r == 16)
-		break;	/* undecided */
-	      m |= r;	/* 1 | 9 | 17 */
-	    }
-	  if (req)
-	    continue;
-	  if ((m & 9) == 9)
-	    m = 9;
-	}
-      if (s->conflicts)
-	{
-	  int ispatch = 0;	/* see solver.c patch handling */
-
-	  if (!strncmp("patch:", pool_id2str(pool, s->name), 6))
-	    ispatch = 1;
-	  conp = s->repo->idarraydata + s->conflicts;
-	  while ((con = *conp++) != 0)
-	    {
-	      if ((providedbyinstalled(pool, map, con, ispatch, multiversionmap) & 1) != 0)
-		{
-		  map[p] = 2;
-		  did = 0;
-		  break;
-		}
-	      if ((m == 1 || m == 17) && ISRELDEP(con))
-		{
-		  con = dep2name(pool, con);
-		  if ((providedbyinstalled(pool, map, con, ispatch, multiversionmap) & 1) != 0)
-		    m = 9;
-		}
-	    }
-	  if (con)
-	    continue;	/* found a conflict */
-	}
-#if 0
-      if (s->repo && s->repo != oldinstalled)
-	{
-	  Id p2, obs, *obsp, *pp;
-	  Solvable *s2;
-	  if (s->obsoletes)
-	    {
-	      obsp = s->repo->idarraydata + s->obsoletes;
-	      while ((obs = *obsp++) != 0)
-		{
-		  if ((providedbyinstalled(pool, map, obs, 0, 0) & 1) != 0)
-		    {
-		      map[p] = 2;
-		      break;
-		    }
-		}
-	      if (obs)
-		continue;
-	    }
-	  FOR_PROVIDES(p2, pp, s->name)
-	    {
-	      s2 = pool->solvables + p2;
-	      if (s2->name == s->name && (map[p2] & 1) != 0)
-		{
-		  map[p] = 2;
-		  break;
-		}
-	    }
-	  if (p2)
-	    continue;
-	}
-#endif
-      if (m != map[p])
-	{
-	  map[p] = m;
-	  did = 0;
-	}
-    }
-  queue_free(res);
-  queue_init_clone(res, pkgs);
-  for (i = 0; i < pkgs->count; i++)
-    {
-      m = map[pkgs->elements[i]];
-      if ((m & 9) == 9)
-	r = 1;
-      else if (m & 1)
-	r = -1;
-      else
-	r = 0;
-      res->elements[i] = r;
-    }
-  free(map);
-}
-
-void
-pool_trivial_installable(Pool *pool, Map *installedmap, Queue *pkgs, Queue *res)
-{
-  pool_trivial_installable_multiversionmap(pool, installedmap, pkgs, res, 0);
-}
-
 const char *
 pool_lookup_str(Pool *pool, Id entry, Id keyname)
 {