dcavalca / rpms / rpm

Forked from rpms/rpm 2 years ago
Clone
4c9460
--- rpm-4.11.3/build/parseReqs.c.orig	2015-08-19 16:24:55.343033682 +0200
4c9460
+++ rpm-4.11.3/build/parseReqs.c	2015-08-19 16:25:26.166111719 +0200
4c9460
@@ -35,16 +35,6 @@
4c9460
 #define	SKIPWHITE(_x)	{while(*(_x) && (risspace(*_x) || *(_x) == ',')) (_x)++;}
4c9460
 #define	SKIPNONWHITE(_x){while(*(_x) &&!(risspace(*_x) || *(_x) == ',')) (_x)++;}
4c9460
 
4c9460
-static int checkSep(const char *s, char c, char **emsg)
4c9460
-{
4c9460
-    const char *sep = strchr(s, c);
4c9460
-    if (sep && strchr(sep + 1, c)) {
4c9460
-	rasprintf(emsg, "Invalid version (double separator '%c'): %s", c, s);
4c9460
-	return 1;
4c9460
-    }
4c9460
-    return 0;
4c9460
-}
4c9460
-
4c9460
 rpmRC parseRCPOT(rpmSpec spec, Package pkg, const char *field, rpmTagVal tagN,
4c9460
 	       int index, rpmsenseFlags tagflags)
4c9460
 {
4c9460
@@ -165,10 +155,6 @@
4c9460
 	    rstrlcpy(EVR, v, (ve-v) + 1);
4c9460
 	    if (rpmCharCheck(spec, EVR, ve-v, ".-_+:%{}~")) goto exit;
4c9460
 
4c9460
-            /* While ':' and '-' are valid, only one of each is valid. */
4c9460
-	    if (checkSep(EVR, '-', &emsg) || checkSep(EVR, ':', &emsg))
4c9460
-		goto exit;
4c9460
-
4c9460
 	    re = ve;	/* ==> next token after EVR string starts here */
4c9460
 	} else
4c9460
 	    EVR = NULL;