diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2010-03-29 06:27:44 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-03-29 06:27:44 +0300 |
| commit | 668f9582917a5b2ffeec7b91f785c6732891b320 (patch) | |
| tree | b363725e3b2d0546712d738900b2fbc21430946b | |
| parent | d160f45ab3ef5e78836ffb668c8c7887ae1081c1 (diff) | |
| download | rpm-668f9582917a5b2ffeec7b91f785c6732891b320.tar.gz rpm-668f9582917a5b2ffeec7b91f785c6732891b320.tar.bz2 rpm-668f9582917a5b2ffeec7b91f785c6732891b320.zip | |
Group the tag cases a bit more logically in parseRCPOT()
| -rw-r--r-- | build/parseReqs.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/build/parseReqs.c b/build/parseReqs.c index 3931c95a5..b659f76e5 100644 --- a/build/parseReqs.c +++ b/build/parseReqs.c @@ -45,6 +45,12 @@ rpmRC parseRCPOT(rpmSpec spec, Package pkg, const char *field, rpmTag tagN, rpmRC rc = RPMRC_FAIL; /* assume failure */ switch (tagN) { + default: + case RPMTAG_REQUIREFLAGS: + nametag = RPMTAG_REQUIRENAME; + tagflags |= RPMSENSE_ANY; + h = pkg->header; + break; case RPMTAG_PROVIDEFLAGS: nametag = RPMTAG_PROVIDENAME; h = pkg->header; @@ -57,10 +63,6 @@ rpmRC parseRCPOT(rpmSpec spec, Package pkg, const char *field, rpmTag tagN, nametag = RPMTAG_CONFLICTNAME; h = pkg->header; break; - case RPMTAG_BUILDCONFLICTS: - nametag = RPMTAG_CONFLICTNAME; - h = spec->buildRestrictions; - break; case RPMTAG_PREREQ: /* XXX map legacy PreReq into Requires(pre,preun) */ nametag = RPMTAG_REQUIRENAME; @@ -93,11 +95,9 @@ rpmRC parseRCPOT(rpmSpec spec, Package pkg, const char *field, rpmTag tagN, tagflags |= RPMSENSE_ANY; h = spec->buildRestrictions; break; - default: - case RPMTAG_REQUIREFLAGS: - nametag = RPMTAG_REQUIRENAME; - tagflags |= RPMSENSE_ANY; - h = pkg->header; + case RPMTAG_BUILDCONFLICTS: + nametag = RPMTAG_CONFLICTNAME; + h = spec->buildRestrictions; break; } |