teknoraver / rpms / rpm

Forked from rpms/rpm 4 months ago
Clone

Blame rpm-4.11.2-double-separator-warning.patch

Panu Matilainen f22eb5
diff -up rpm-4.11.2/build/parseReqs.c.double-sep-warning rpm-4.11.2/build/parseReqs.c
Panu Matilainen f22eb5
--- rpm-4.11.2/build/parseReqs.c.double-sep-warning	2014-02-18 08:59:32.692891895 +0200
Panu Matilainen f22eb5
+++ rpm-4.11.2/build/parseReqs.c	2014-02-18 09:00:17.572769945 +0200
Panu Matilainen f22eb5
@@ -166,8 +166,11 @@ rpmRC parseRCPOT(rpmSpec spec, Package p
Panu Matilainen f22eb5
 	    if (rpmCharCheck(spec, EVR, ve-v, ".-_+:%{}~")) goto exit;
Panu Matilainen f22eb5
 
Panu Matilainen f22eb5
             /* While ':' and '-' are valid, only one of each is valid. */
Panu Matilainen f22eb5
-	    if (checkSep(EVR, '-', &emsg) || checkSep(EVR, ':', &emsg))
Panu Matilainen f22eb5
-		goto exit;
Panu Matilainen f22eb5
+	    if (checkSep(EVR, '-', &emsg) || checkSep(EVR, ':', &emsg)) {
Panu Matilainen f22eb5
+		rpmlog(RPMLOG_WARNING, _("line %d: %s: %s\n"),
Panu Matilainen f22eb5
+		       spec->lineNum, emsg, spec->line);
Panu Matilainen f22eb5
+		emsg = _free(emsg);
Panu Matilainen f22eb5
+	    }
Panu Matilainen f22eb5
 
Panu Matilainen f22eb5
 	    re = ve;	/* ==> next token after EVR string starts here */
Panu Matilainen f22eb5
 	} else