hashmask = pool->relhashmask;
hashtbl = pool->relhashtbl;
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);
hashtbl[h] = i;
}
}
-
+
/* compute hash and check for match */
h = relhash(name, evr, flags) & hashmask;
hh = HASHCHAIN_START;
/* Id -> String
* for rels (returns name only) and strings
- */
+ */
const char *
pool_id2str(const Pool *pool, Id id)
{
rd = GETRELDEP(pool, id);
switch (rd->flags)
{
- case 0: case 2: case 3:
- case 6: case 7:
+ /* debian special cases < and > */
+ /* haiku special cases <> (maybe we should use != for the others as well */
+ case 0: case REL_EQ: case REL_GT | REL_EQ:
+ case REL_LT | REL_EQ: case REL_LT | REL_EQ | REL_GT:
#if !defined(DEBIAN) && !defined(MULTI_SEMANTICS)
- case 1: case 4:
+ case REL_LT: case REL_GT:
#endif
#if !defined(HAIKU) && !defined(MULTI_SEMANTICS)
- case 5:
+ case REL_LT | REL_GT:
#endif
return rels[rd->flags];
#if defined(DEBIAN) || defined(MULTI_SEMANTICS)
- case 1:
+ case REL_GT:
return pool->disttype == DISTTYPE_DEB ? " >> " : rels[rd->flags];
- case 4:
+ case REL_LT:
return pool->disttype == DISTTYPE_DEB ? " << " : rels[rd->flags];
#endif
#if defined(HAIKU) || defined(MULTI_SEMANTICS)
- case 5:
+ case REL_LT | REL_GT:
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_WITHOUT:
+ return pool->disttype == DISTTYPE_RPM ? " without " : " - ";
case REL_NAMESPACE:
return " NAMESPACE "; /* actually not used in dep2str */
case REL_ARCH:
return ".";
+ case REL_MULTIARCH:
+ return ":";
case REL_FILECONFLICT:
return " FILECONFLICT ";
case REL_COND:
- return " IF ";
+ return pool->disttype == DISTTYPE_RPM ? " if " : " IF ";
+ case REL_UNLESS:
+ return pool->disttype == DISTTYPE_RPM ? " unless " : " UNLESS ";
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;
}
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_WITHOUT || oldrel == REL_COND || oldrel == REL_UNLESS || oldrel == REL_ELSE || oldrel == -1)
+ if (rel == REL_AND || rel == REL_OR || rel == REL_WITH || rel == REL_WITHOUT || rel == REL_COND || rel == REL_UNLESS || rel == REL_ELSE)
+ if ((oldrel != rel || rel == REL_COND || rel == REL_UNLESS || rel == REL_ELSE) && !((oldrel == REL_COND || oldrel == REL_UNLESS) && rel == REL_ELSE))
{
*p++ = '(';
dep2strcpy(pool, p, rd->name, rd->flags);
strcat(p, ")");
return;
}
+ if (rd->flags == REL_KIND)
+ {
+ dep2strcpy(pool, p, rd->evr, rd->flags);
+ p += strlen(p);
+ *p++ = ':';
+ id = rd->name;
+ oldrel = rd->flags;
+ continue;
+ }
dep2strcpy(pool, p, rd->name, rd->flags);
p += strlen(p);
if (rd->flags == REL_NAMESPACE)
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;
}