diff options
| author | marc <devnull@localhost> | 1998-01-26 15:52:56 +0000 |
|---|---|---|
| committer | marc <devnull@localhost> | 1998-01-26 15:52:56 +0000 |
| commit | b910492639f20d8d37b5839da72d4fca6a04671e (patch) | |
| tree | 612ac6d856befcd72affa8dbf504f20abdef3f4e /build/parsePreamble.c | |
| parent | 2ae55b71cba7599bf5441e3f97874e76f26c3ba7 (diff) | |
| download | librpm-tizen-b910492639f20d8d37b5839da72d4fca6a04671e.tar.gz librpm-tizen-b910492639f20d8d37b5839da72d4fca6a04671e.tar.bz2 librpm-tizen-b910492639f20d8d37b5839da72d4fca6a04671e.zip | |
Fix bug where macros were being improperly set for Patch: and Source: lines.
CVS patchset: 1978
CVS date: 1998/01/26 15:52:56
Diffstat (limited to 'build/parsePreamble.c')
| -rw-r--r-- | build/parsePreamble.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/build/parsePreamble.c b/build/parsePreamble.c index 9457d0fb7..0b27fcff0 100644 --- a/build/parsePreamble.c +++ b/build/parsePreamble.c @@ -324,10 +324,6 @@ static int handlePreambleTag(Spec spec, Package pkg, int tag, char *macro, multiToken = 1; } - if (macro) { - addMacro(&spec->macros, macro, field); - } - switch (tag) { case RPMTAG_NAME: case RPMTAG_VERSION: @@ -407,6 +403,7 @@ static int handlePreambleTag(Spec spec, Package pkg, int tag, char *macro, case RPMTAG_SOURCE: case RPMTAG_PATCH: SINGLE_TOKEN_ONLY; + macro = NULL; if ((rc = addSource(spec, pkg, field, tag))) { return rc; } @@ -465,6 +462,10 @@ static int handlePreambleTag(Spec spec, Package pkg, int tag, char *macro, return RPMERR_INTERNAL; } + if (macro) { + addMacro(&spec->macros, macro, field); + } + return 0; } |