From: Michael Schroeder <mls@suse.de>
Date: Tue, 25 Aug 2015 11:59:46 +0000 (+0200)
Subject: Remove support for THEN, make ELSE work with IF
X-Git-Tag: 0.6.12~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44e58424ad11008f6b4d6bd7bfd40d5f2e0259b1;p=thirdparty%2Flibsolv.git

Remove support for THEN, make ELSE work with IF
---

diff --git a/ext/pool_parserpmrichdep.c b/ext/pool_parserpmrichdep.c
index b048aeb4..c91e7d88 100644
--- a/ext/pool_parserpmrichdep.c
+++ b/ext/pool_parserpmrichdep.c
@@ -12,8 +12,6 @@
 #include "pool.h"
 #include "pool_parserpmrichdep.h"
 
-#define REL_THEN 0
-
 static struct RichOpComp {
   const char *n;
   int l;
@@ -26,10 +24,7 @@ static struct RichOpComp {
   { "|", 1, REL_OR },
   { "OR", 2, REL_OR },
   { "IF", 2, REL_COND },
-  { "THEN", 4, REL_THEN },
-  { "?", 1, REL_THEN },
   { "ELSE", 4, REL_ELSE },
-  { ":", 1, REL_ELSE },
   { NULL, 0, 0},
 };
 
@@ -115,7 +110,7 @@ parseRichDep(Pool *pool, const char **depp, Id chainfl)
   fl = op->fl;
   if (!fl)
     return 0;
-  if (chainfl == REL_THEN && fl == REL_ELSE)
+  if (chainfl == REL_COND && fl == REL_ELSE)
     chainfl = 0;
   if (chainfl && fl != chainfl)
     return 0;