Attachment #366 for bug #3883

View | Details | Raw Unified | Return to bug 3883
Collapse All | Expand All




	/* Names must not contain '%<=>' symbols - it's common error */
	if (strpbrk (req, "%<=>")) {
	    rpmError(RPMERR_BADSPEC,
		     _("line %d: Dependency tokens must not contain '%%<=>' symbols: %s\n"
		       "\tRequires token (possibly autogenerated): %s\n"),
		     spec->lineNum, spec->line, req);
	    return RPMERR_BADSPEC;
	}


	/* Versions must not contain '%<=>' symbols - it's common error */
	if (version && strpbrk (version, "%<=>")) {
	    rpmError(RPMERR_BADSPEC,
		     _("line %d: Dependency tokens must not contain '%%<=>' symbols: %s\n"
		       "\tVersion component (possibly autogenerated): %s\n"),
		     spec->lineNum, spec->line, version);
	    req = _free(req);
	    version = _free(version);
	    return RPMERR_BADSPEC;

Return to bug 3883

Lines 127-134 Link Here

(-)rpm-4_0-4.0.4/build/parseReqs.c.error_orig (-4 / +6 lines)
127	/* Names must not contain '%<=>' symbols - it's common error */	127	/* Names must not contain '%<=>' symbols - it's common error */
128	if (strpbrk (req, "%<=>")) {	128	if (strpbrk (req, "%<=>")) {
129	rpmError(RPMERR_BADSPEC,	129	rpmError(RPMERR_BADSPEC,
130	_("line %d: Dependency tokens must not contain '%%<=>' symbols: %s\n"),	130	_("line %d: Dependency tokens must not contain '%%<=>' symbols: %s\n"
131	spec->lineNum, spec->line);	131	"\tRequires token (possibly autogenerated): %s\n"),
		132	spec->lineNum, spec->line, req);
132	return RPMERR_BADSPEC;	133	return RPMERR_BADSPEC;
133	}	134	}
134		135
Lines 195-202 Link Here
195	/* Versions must not contain '%<=>' symbols - it's common error */	196	/* Versions must not contain '%<=>' symbols - it's common error */
196	if (version && strpbrk (version, "%<=>")) {	197	if (version && strpbrk (version, "%<=>")) {
197	rpmError(RPMERR_BADSPEC,	198	rpmError(RPMERR_BADSPEC,
198	_("line %d: Dependency tokens must not contain '%%<=>' symbols: %s\n"),	199	_("line %d: Dependency tokens must not contain '%%<=>' symbols: %s\n"
199	spec->lineNum, spec->line);	200	"\tVersion component (possibly autogenerated): %s\n"),
		201	spec->lineNum, spec->line, version);
200	req = _free(req);	202	req = _free(req);
201	version = _free(version);	203	version = _free(version);
202	return RPMERR_BADSPEC;	204	return RPMERR_BADSPEC;