Imported Upstream version 0.6.5

[platform/upstream/libsolv.git] / src / solverdebug.c

diff --git a/src/solverdebug.c b/src/solverdebug.c
index 9053883..3e84046 100644 (file)
--- a/src/solverdebug.c
+++ b/src/solverdebug.c
@@ -75,7 +75,7 @@ solver_printrule(Solver *solv, int type, Rule *r)
     POOL_DEBUG(type, "Rule #%d:", (int)(r - solv->rules));
   else
     POOL_DEBUG(type, "Rule:");                /* r is any rule */
-  if (r && r->d < 0)
+  if (r->d < 0)
     POOL_DEBUG(type, " (disabled)");
   POOL_DEBUG(type, "\n");
   d = r->d < 0 ? -r->d - 1 : r->d;
@@ -126,6 +126,8 @@ solver_printruleclass(Solver *solv, int type, Rule *r)
     POOL_DEBUG(type, "UPDATE ");
   else if (p >= solv->featurerules && p < solv->featurerules_end)
     POOL_DEBUG(type, "FEATURE ");
+  else if (p >= solv->yumobsrules && p < solv->yumobsrules_end)
+    POOL_DEBUG(type, "YUMOBS ");
   solver_printrule(solv, type, r);
 }
 
@@ -572,18 +574,18 @@ solver_printtrivial(Solver *solv)
   Pool *pool = solv->pool;
   Queue in, out;
   Id p;
-  const char *n; 
-  Solvable *s; 
+  const char *n;
+  Solvable *s;
   int i;
 
   queue_init(&in);
   for (p = 1, s = pool->solvables + p; p < solv->pool->nsolvables; p++, s++)
-    {   
+    {
       n = pool_id2str(pool, s->name);
       if (strncmp(n, "patch:", 6) != 0 && strncmp(n, "pattern:", 8) != 0)
         continue;
-      queue_push(&in, p); 
-    }   
+      queue_push(&in, p);
+    }
   if (!in.count)
     {
       queue_free(&in);