summaryrefslogtreecommitdiff
path: root/build/parseSpec.c
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2003-05-15 13:53:41 +0000
committerjbj <devnull@localhost>2003-05-15 13:53:41 +0000
commitcdb6cfe7f06f52c1285f1dca63f680d01a90dfc6 (patch)
treedce7f059a295b8d72e86276d7998aa4a8a98f78c /build/parseSpec.c
parentbf8cae09c80ae3f6551e8247ed02ffd24636c296 (diff)
downloadrpm-cdb6cfe7f06f52c1285f1dca63f680d01a90dfc6.tar.gz
rpm-cdb6cfe7f06f52c1285f1dca63f680d01a90dfc6.tar.bz2
rpm-cdb6cfe7f06f52c1285f1dca63f680d01a90dfc6.zip
- fix: nested %if handling, optind initialization posix vs. glibc.
CVS patchset: 6843 CVS date: 2003/05/15 13:53:41
Diffstat (limited to 'build/parseSpec.c')
-rw-r--r--build/parseSpec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/build/parseSpec.c b/build/parseSpec.c
index 6fd6ef172..76140a7a7 100644
--- a/build/parseSpec.c
+++ b/build/parseSpec.c
@@ -273,7 +273,9 @@ retry:
SKIPSPACE(s);
match = -1;
- if (! strncmp("%ifarch", s, sizeof("%ifarch")-1)) {
+ if (!spec->readStack->reading && !strncmp("%if", s, sizeof("%if")-1)) {
+ match = 0;
+ } else if (! strncmp("%ifarch", s, sizeof("%ifarch")-1)) {
const char *arch = rpmExpand("%{_target_cpu}", NULL);
s += 7;
match = matchTok(arch, s);