folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Always fail build on unknown dependency qualifiers 

- previously unknown qualifiers would go unnoticed if they happened
  be last (including being the only qualifier), eg Requires(pre,junk)
  or Requires(junk) would be cheerfully accepted but Requires(junk,pre) not.
This commit is contained in:
Panu Matilainen 2010-03-29 08:30:18 +03:00
parent 1ab0222b03
commit bf2bc18ebb
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/parsePreamble.c
View File

@ -138,6 +138,7 @@ static int parseBits(const char * s, const tokenBits tokbits,
const char * se;
rpmsenseFlags bits = RPMSENSE_ANY;
int c = 0;
int rc = RPMRC_OK;
if (s) {
while (*s != '\0') {
@ -151,8 +152,10 @@ static int parseBits(const char * s, const tokenBits tokbits,
strlen(tb->name) == (se-s) && rstreqn(tb->name, s, (se-s)))
break;
}
if (tb->name == NULL)
if (tb->name == NULL) {
rc = RPMRC_FAIL;
break;
}
bits |= tb->bits;
while ((c = *se) && risspace(c)) se++;
if (c != ',')
@ -160,8 +163,8 @@ static int parseBits(const char * s, const tokenBits tokbits,
s = ++se;
}
}
if (c == 0 && bp) *bp = bits;
return (c ? RPMRC_FAIL : RPMRC_OK);
*bp |= bits;
return rc;
}
/**