From: Michael Schroeder Date: Wed, 27 Mar 2019 12:43:24 +0000 (+0100) Subject: Revert last two commits, we need to do this different X-Git-Tag: 0.7.4~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7d064a56721df0fe0b5eca661bd6f9560015ef4;p=thirdparty%2Flibsolv.git Revert last two commits, we need to do this different Seems like we really need REL_CONDA to implement conda's MatchSpec. --- diff --git a/src/poolid.c b/src/poolid.c index ef0d95d4..4cd09137 100644 --- a/src/poolid.c +++ b/src/poolid.c @@ -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 > */