richardphibel / rpms / rpm

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