X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fpool.c;h=09354ef69ff41294ba7820546049e8a2c23f727b;hb=f078975d65d0cace665590f3cf60025e6f2c7a0a;hp=be6a4193baa6a1a7ef5193216c3dc820b523ef94;hpb=d4334b3ee7ce4f5c736d3bda979388a87ba7aef3;p=platform%2Fupstream%2Flibsolv.git

diff --git a/src/pool.c b/src/pool.c
index be6a419..09354ef 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -27,6 +27,9 @@
 #include "util.h"
 #include "bitmap.h"
 #include "evr.h"
+#ifdef ENABLE_CONDA
+#include "conda.h"
+#endif
 
 #define SOLVABLE_BLOCK	255
 
@@ -158,6 +161,9 @@ pool_setdisttype(Pool *pool, int disttype)
     case DISTTYPE_HAIKU:
       pool->noarchid = ARCH_ANY;
       break;
+    case DISTTYPE_CONDA:
+      pool->noarchid = ARCH_ANY;
+      break;
     default:
       return -1;
     }
@@ -1281,6 +1287,23 @@ pool_addrelproviders(Pool *pool, Id d)
 		queue_push(&plist, p);
 	    }
 	  break;
+#ifdef ENABLE_CONDA
+	case REL_CONDA:
+	  wp = pool_whatprovides(pool, name);
+	  if (evr)
+	    {
+	      const char *evrstr = pool_id2str(pool, evr);
+	      pp = pool->whatprovidesdata + wp;
+	      while ((p = *pp++) != 0)
+		{
+		  if (solvable_conda_matchversion(pool->solvables + p, evrstr))
+		    queue_push(&plist, p);
+		  else
+		    wp = 0;
+		}
+	    }
+	  break;
+#endif
 	default:
 	  break;
 	}
@@ -1598,7 +1621,7 @@ pool_setdebuglevel(Pool *pool, int level)
   if (level > 2)
     mask |= SOLV_DEBUG_PROPAGATE;
   if (level > 3)
-    mask |= SOLV_DEBUG_RULE_CREATION;
+    mask |= SOLV_DEBUG_RULE_CREATION | SOLV_DEBUG_WATCHES;
   mask |= pool->debugmask & SOLV_DEBUG_TO_STDERR;	/* keep bit */
   pool->debugmask = mask;
 }