diff options
| author | Jindrich Novy <jnovy@redhat.com> | 2009-06-10 09:16:45 +0200 |
|---|---|---|
| committer | Jindrich Novy <jnovy@redhat.com> | 2009-06-10 09:16:45 +0200 |
| commit | 53e48bc469eb0dbea0629efa9abadad0d9b4bdea (patch) | |
| tree | 70ae49c8484a6dd88496cdee7d87323960a96fb1 /build | |
| parent | 7653f770130626dd42e57395d232696d47e66ca3 (diff) | |
| download | rpm-53e48bc469eb0dbea0629efa9abadad0d9b4bdea.tar.gz rpm-53e48bc469eb0dbea0629efa9abadad0d9b4bdea.tar.bz2 rpm-53e48bc469eb0dbea0629efa9abadad0d9b4bdea.zip | |
Nuke useless compatibility stuff and put V/R checking where it belongs
Diffstat (limited to 'build')
| -rw-r--r-- | build/parsePreamble.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/build/parsePreamble.c b/build/parsePreamble.c index 8d4daea3b..23efbf8c6 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.c @@ -502,25 +502,14 @@ static int handlePreambleTag(rpmSpec spec, Package pkg, rpmTag tag, spec->lineNum, spec->line); return RPMRC_FAIL; } + if (tag != RPMTAG_NAME && strchr(field, '-')) { + rpmlog(RPMLOG_ERR, _("line %d: Illegal char '-' in %s: %s\n"), + spec->lineNum, "version", spec->line); + return RPMRC_FAIL; + } case RPMTAG_URL: case RPMTAG_DISTTAG: SINGLE_TOKEN_ONLY; - /* These macros are for backward compatibility */ - if (tag == RPMTAG_VERSION) { - if (strchr(field, '-') != NULL) { - rpmlog(RPMLOG_ERR, _("line %d: Illegal char '-' in %s: %s\n"), - spec->lineNum, "version", spec->line); - return RPMRC_FAIL; - } - addMacro(spec->macros, "PACKAGE_VERSION", NULL, field, RMIL_OLDSPEC); - } else if (tag == RPMTAG_RELEASE) { - if (strchr(field, '-') != NULL) { - rpmlog(RPMLOG_ERR, _("line %d: Illegal char '-' in %s: %s\n"), - spec->lineNum, "release", spec->line); - return RPMRC_FAIL; - } - addMacro(spec->macros, "PACKAGE_RELEASE", NULL, field, RMIL_OLDSPEC-1); - } headerPutString(pkg->header, tag, field); break; case RPMTAG_GROUP: |