X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fpoolid.c;h=3a8a3c8050086c7678ebaebc1b0cba04d75ac9ba;hb=e1659dc4ce74d3c47f465103951dafff8fc0cf9f;hp=5fe502b495d79d6a483e4f231d7ed7ab94f3ebe9;hpb=08382265e737225adba8fd24e9c97e966d280b2d;p=platform%2Fupstream%2Flibsolv.git

diff --git a/src/poolid.c b/src/poolid.c
index 5fe502b..3a8a3c8 100644
--- a/src/poolid.c
+++ b/src/poolid.c
@@ -65,7 +65,7 @@ pool_rel2id(Pool *pool, Id name, Id evr, int flags, int create)
   ran = pool->rels;
 
   /* extend hashtable if needed */
-  if (pool->nrels * 2 > hashmask)
+  if ((Hashval)pool->nrels * 2 > hashmask)
     {
       solv_free(pool->relhashtbl);
       pool->relhashmask = hashmask = mkmask(pool->nrels + REL_BLOCK);
@@ -173,11 +173,11 @@ pool_id2rel(const Pool *pool, Id id)
       return pool->disttype == DISTTYPE_HAIKU ? " != " : rels[rd->flags];
 #endif
     case REL_AND:
-      return " & ";
+      return pool->disttype == DISTTYPE_RPM ? " and " : " & ";
     case REL_OR:
-      return " | ";
+      return pool->disttype == DISTTYPE_RPM ? " or " : " | ";
     case REL_WITH:
-      return " + ";
+      return pool->disttype == DISTTYPE_RPM ? " with " : " + ";
     case REL_NAMESPACE:
       return " NAMESPACE ";	/* actually not used in dep2str */
     case REL_ARCH:
@@ -187,11 +187,15 @@ pool_id2rel(const Pool *pool, Id id)
     case REL_FILECONFLICT:
       return " FILECONFLICT ";
     case REL_COND:
-      return " IF ";
+      return pool->disttype == DISTTYPE_RPM ? " if " : " IF ";
     case REL_COMPAT:
       return " compat >= ";
     case REL_KIND:
       return " KIND ";
+    case REL_ELSE:
+      return pool->disttype == DISTTYPE_RPM ? " else " : " ELSE ";
+    case REL_ERROR:
+      return " ERROR ";
     default:
       break;
     }
@@ -233,9 +237,10 @@ dep2strcpy(const Pool *pool, char *p, Id id, int oldrel)
   while (ISRELDEP(id))
     {
       Reldep *rd = GETRELDEP(pool, id);
-      if (oldrel == REL_AND || oldrel == REL_OR || oldrel == REL_WITH)
-	if (rd->flags == REL_AND || rd->flags == REL_OR || rd->flags == REL_WITH)
-	  if (oldrel != rd->flags)
+      int rel = rd->flags;
+      if (oldrel == REL_AND || oldrel == REL_OR || oldrel == REL_WITH || oldrel == REL_COND || oldrel == REL_ELSE || oldrel == -1)
+	if (rel == REL_AND || rel == REL_OR || rel == REL_WITH || rel == REL_COND || rel == REL_ELSE)
+	  if ((oldrel != rel || rel == REL_COND || rel == REL_ELSE) && !(oldrel == REL_COND && rel == REL_ELSE))
 	    {
 	      *p++ = '(';
 	      dep2strcpy(pool, p, rd->name, rd->flags);
@@ -284,7 +289,7 @@ pool_dep2str(Pool *pool, Id id)
   if (!ISRELDEP(id))
     return pool->ss.stringspace + pool->ss.strings[id];
   p = pool_alloctmpspace(pool, dep2strlen(pool, id) + 1);
-  dep2strcpy(pool, p, id, 0);
+  dep2strcpy(pool, p, id, pool->disttype == DISTTYPE_RPM ? -1 : 0);
   return p;
 }