Group the tag cases a bit more logically in parseRCPOT()
authorPanu Matilainen <pmatilai@redhat.com>
Mon, 29 Mar 2010 03:27:44 +0000 (06:27 +0300)
committerPanu Matilainen <pmatilai@redhat.com>
Mon, 29 Mar 2010 03:27:44 +0000 (06:27 +0300)
build/parseReqs.c

index 3931c95..b659f76 100644 (file)
@@ -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;
     }