removed stdin verification modes

CVS patchset: 1383
CVS date: 1997/01/30 19:58:55

diff --git a/verify.c b/verify.c
index 9d5fe7b..2db2d5a 100644 (file)
--- a/verify.c
+++ b/verify.c
@@ -142,8 +142,7 @@ void doVerify(char * prefix, enum verifysources source, char ** argv,
     dbiIndexSet matches;
     char * arg;
 
-    if ((source == VERIFY_SRPM || source == VERIFY_RPM) && 
-       !(verifyFlags & VERIFY_DEPS)) {
+    if (source == VERIFY_RPM && !(verifyFlags & VERIFY_DEPS)) {
        db = NULL;
     } else {
        if (rpmdbOpen(prefix, &db, O_RDONLY, 0644)) {
@@ -168,7 +167,6 @@ void doVerify(char * prefix, enum verifysources source, char ** argv,
            arg = *argv++;
 
            switch (source) {
-             case VERIFY_SRPM:
              case VERIFY_RPM:
                fd = open(arg, O_RDONLY);
                if (fd < 0) {
@@ -189,7 +187,6 @@ void doVerify(char * prefix, enum verifysources source, char ** argv,
                        
                break;
 
-             case VERIFY_SGROUP:
              case VERIFY_GRP:
                if (rpmdbFindByGroup(db, arg, &matches)) {
                    fprintf(stderr, "group %s does not contain any pacakges\n", 
@@ -200,7 +197,6 @@ void doVerify(char * prefix, enum verifysources source, char ** argv,
                }
                break;
 
-             case VERIFY_SPATH:
              case VERIFY_PATH:
                if (rpmdbFindByFile(db, arg, &matches)) {
                    fprintf(stderr, "file %s is not owned by any package\n", 
@@ -211,7 +207,6 @@ void doVerify(char * prefix, enum verifysources source, char ** argv,
                }
                break;
 
-             case VERIFY_SPACKAGE:
              case VERIFY_PACKAGE:
                rc = findPackageByLabel(db, arg, &matches);
                if (rc == 1) 
@@ -230,7 +225,7 @@ void doVerify(char * prefix, enum verifysources source, char ** argv,
        }
     }
    
-    if (source != VERIFY_SRPM && source != VERIFY_RPM) {
+    if (source != VERIFY_RPM) {
        rpmdbClose(db);
     }
 }

diff --git a/verify.h b/verify.h
index 53a10c0..709581b 100644 (file)
--- a/verify.h
+++ b/verify.h
@@ -8,9 +8,8 @@
 #define VERIFY_SCRIPT          (1 << 2)
 #define VERIFY_MD5             (1 << 3)
 
-enum verifysources { VERIFY_PATH, VERIFY_PACKAGE, VERIFY_EVERY, VERIFY_SPATH,
-                    VERIFY_SPACKAGE, VERIFY_RPM, VERIFY_SRPM, VERIFY_GRP,
-                    VERIFY_SGROUP };
+enum verifysources { VERIFY_PATH, VERIFY_PACKAGE, VERIFY_EVERY, VERIFY_RPM, 
+                       VERIFY_SRPM, VERIFY_GRP, };
 
 void doVerify(char * prefix, enum verifysources source, char ** argv,
              int verifyFlags);