Remove hysterically useless RPMSIGN_NONE + --sign popt leftovers

diff --git a/lib/poptQV.c b/lib/poptQV.c
index 2d8891b..c7bee76 100644 (file)
--- a/lib/poptQV.c
+++ b/lib/poptQV.c
@@ -297,8 +297,6 @@ struct poptOption rpmSignPoptTable[] = {
        N_("import an armored public key"), NULL },
  { "resign", '\0', 0, NULL, 'R',
        N_("sign package(s) (identical to --addsign)"), NULL },
- { "sign", '\0', POPT_ARGFLAG_DOC_HIDDEN, &rpmQVKArgs.sign, 0,
-       N_("generate signature"), NULL },
 
    POPT_TABLEEND
 };

diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index e54c5e6..5bfab20 100644 (file)
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -807,7 +807,6 @@ int rpmcliSign(rpmts ts, QVA_t qva, ARGV_const_t argv)
     case RPMSIGN_DEL_SIGNATURE:
        return rpmReSign(ts, qva, argv);
        break;
-    case RPMSIGN_NONE:
     default:
        return -1;
        break;

diff --git a/lib/rpmcli.h b/lib/rpmcli.h
index 9e1cf24..ef28229 100644 (file)
--- a/lib/rpmcli.h
+++ b/lib/rpmcli.h
@@ -430,7 +430,6 @@ extern struct poptOption rpmDatabasePoptTable[];
  * Bit(s) to control rpmReSign() operation.
  */
 typedef enum rpmSignFlags_e {
-    RPMSIGN_NONE               = 0,
     RPMSIGN_CHK_SIGNATURE      = 'K',  /*!< from --checksig */
     RPMSIGN_NEW_SIGNATURE      = 'R',  /*!< from --resign */
     RPMSIGN_ADD_SIGNATURE      = 'A',  /*!< from --addsign */

diff --git a/rpmqv.c b/rpmqv.c
index 979a4ee..5f3181f 100644 (file)
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -211,9 +211,6 @@ int main(int argc, char *argv[])
 #ifdef IAM_RPMK
   if (bigMode == MODE_UNKNOWN || (bigMode & MODES_K)) {
        switch (ka->qva_mode) {
-       case RPMSIGN_NONE:
-           ka->sign = 0;
-           break;
        case RPMSIGN_IMPORT_PUBKEY:
        case RPMSIGN_CHK_SIGNATURE:
            bigMode = MODE_CHECKSIG;