sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parseRCPOT: tokens must not contain '%<=>' symbols - it's common error

Browse Source
This commit is contained in:
Дмитрий Левин 2004-01-27 10:56:42 +00:00
parent f3023c5d3b
commit 84c595d9ef
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build/parseReqs.c
View File

@ -103,14 +103,6 @@ int parseRCPOT(Spec spec, Package pkg, const char *field, int tag,
return RPMERR_BADSPEC;
}
/* Tokens must not contain '%' symbol - it's common error */
if (strchr (r, '%')) {
rpmError(RPMERR_BADSPEC,
_("line %d: Dependency tokens must not contain '%%' symbol: %s\n"),
spec->lineNum, spec->line);
return RPMERR_BADSPEC;
}
/* Don't permit file names as args for certain tags */
switch (tag) {
case RPMTAG_OBSOLETEFLAGS:
@ -132,6 +124,14 @@ int parseRCPOT(Spec spec, Package pkg, const char *field, int tag,
strncpy(req, r, (re-r));
req[re-r] = '\0';
/* 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"),
spec->lineNum, spec->line);
return RPMERR_BADSPEC;
}
/* Parse version */
v = re;
SKIPWHITE(v);
@ -192,10 +192,10 @@ int parseRCPOT(Spec spec, Package pkg, const char *field, int tag,
version = NULL;
/*@=branchstate@*/
/* Versions must not contain '%' symbol - it's common error */
if (version && strchr (version, '%')) {
/* Versions must not contain '%<=>' symbols - it's common error */
if (version && strpbrk (version, "%<=>")) {
rpmError(RPMERR_BADSPEC,
_("line %d: Dependency tokens must not contain '%%' symbol: %s\n"),
_("line %d: Dependency tokens must not contain '%%<=>' symbols: %s\n"),
spec->lineNum, spec->line);
req = _free(req);
version = _free(version);