]> git.ipfire.org Git - thirdparty/libsolv.git/commitdiff
Revert last two commits, we need to do this different
authorMichael Schroeder <mls@suse.de>
Wed, 27 Mar 2019 12:43:24 +0000 (13:43 +0100)
committerMichael Schroeder <mls@suse.de>
Wed, 27 Mar 2019 12:43:24 +0000 (13:43 +0100)
Seems like we really need REL_CONDA to implement conda's MatchSpec.

src/poolid.c

index ef0d95d418ed6585a2a8ef458ca866f45737bdcc..4cd09137e8ac47525c02c9f451eaef3db97bb852 100644 (file)
@@ -169,19 +169,6 @@ pool_id2rel(const Pool *pool, Id id)
     return "";
   rd = GETRELDEP(pool, id);
 
-#ifdef ENABLE_CONDA
-  if (pool->disttype == DISTTYPE_CONDA)
-    {
-      static const char *condarels[] = { "!", ">", "==", ">=", "<", "!=", "<=", "<=>" };
-      if (rd->flags < 8)
-        return condarels[rd->flags];
-      if (rd->flags == REL_WITH)
-        return ",";
-      if (rd->flags == REL_OR)
-        return "|";
-    }
-#endif
-
   switch (rd->flags)
     {
     /* debian special cases < and > */