From 0b53f43165e03eaae0d9be84869902d303c2fb7f Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Wed, 6 Sep 2017 14:21:45 +0200 Subject: [PATCH] rpm upstream accepted the 'unless' pull request --- ext/pool_parserpmrichdep.c | 3 ++- ext/testcase.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ext/pool_parserpmrichdep.c b/ext/pool_parserpmrichdep.c index 0b546776..93d77f8e 100644 --- a/ext/pool_parserpmrichdep.c +++ b/ext/pool_parserpmrichdep.c @@ -20,6 +20,7 @@ static struct RichOpComp { { "and", 3, REL_AND }, { "or", 2, REL_OR }, { "if", 2, REL_COND }, + { "unless", 6, REL_UNLESS }, { "else", 4, REL_ELSE }, { "with", 4, REL_WITH }, { "without", 7, REL_WITHOUT }, @@ -108,7 +109,7 @@ parseRichDep(Pool *pool, const char **depp, Id chainfl) fl = op->fl; if (!fl) return 0; - if (chainfl == REL_COND && fl == REL_ELSE) + if ((chainfl == REL_COND || chainfl == REL_UNLESS) && fl == REL_ELSE) chainfl = 0; if (chainfl && fl != chainfl) return 0; diff --git a/ext/testcase.c b/ext/testcase.c index 25c23cb9..77cc7194 100644 --- a/ext/testcase.c +++ b/ext/testcase.c @@ -393,6 +393,7 @@ struct oplist { { REL_KIND, "" }, { REL_ELSE, "" }, { REL_ERROR, "" }, + { REL_UNLESS, "" }, { REL_LT, "<" }, { 0, 0 } }; -- 2.47.2