Eliminate epoch promotion debug cruft

- might've been useful back in the day but...

diff --git a/lib/rpmds.c b/lib/rpmds.c
index 93630fd..05676fd 100644 (file)
--- a/lib/rpmds.c
+++ b/lib/rpmds.c
@@ -11,17 +11,10 @@
 
 #include "debug.h"
 
-/**
- * Enable noisy range comparison debugging message?
- */
-static int _noisy_range_comparison_debug_message = 0;
-
 int _rpmds_debug = 0;
 
 int _rpmds_nopromote = 1;
 
-int _rpmds_unspecified_epoch_noise = 0;
-
 /**
  * A package dependency set.
  */
@@ -740,8 +733,6 @@ void parseEVR(char * evr,
 
 int rpmdsCompare(const rpmds A, const rpmds B)
 {
-    const char *aDepend = (A->DNEVR != NULL ? A->DNEVR+2 : "");
-    const char *bDepend = (B->DNEVR != NULL ? B->DNEVR+2 : "");
     char *aEVR, *bEVR;
     const char *aE, *aV, *aR, *bE, *bV, *bR;
     int result;
@@ -783,9 +774,6 @@ int rpmdsCompare(const rpmds A, const rpmds B)
        sense = rpmvercmp(aE, bE);
     else if (aE && *aE && atol(aE) > 0) {
        if (!B->nopromote) {
-           int lvl = (_rpmds_unspecified_epoch_noise  ? RPMLOG_WARNING : RPMLOG_DEBUG);
-           rpmlog(lvl, _("The \"B\" dependency needs an epoch (assuming same epoch as \"A\")\n\tA = \"%s\"\tB = \"%s\"\n"),
-               aDepend, bDepend);
            sense = 0;
        } else
            sense = 1;
@@ -814,9 +802,6 @@ int rpmdsCompare(const rpmds A, const rpmds B)
     }
 
 exit:
-    if (_noisy_range_comparison_debug_message)
-    rpmlog(RPMLOG_DEBUG, "  %s    A %s\tB %s\n",
-       (result ? "YES" : "NO "), aDepend, bDepend);
     return result;
 }
 

diff --git a/lib/verify.c b/lib/verify.c
index 65fafda..c7ffc51 100644 (file)
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -442,12 +442,8 @@ int showVerifyPackage(QVA_t qva, rpmts ts, Header h)
     int rc;
 
     if (qva->qva_flags & VERIFY_DEPS) {
-       int save_noise = _rpmds_unspecified_epoch_noise;
-       if (rpmIsVerbose())
-           _rpmds_unspecified_epoch_noise = 1;
        if ((rc = verifyDependencies(qva, ts, h)) != 0)
            ec = rc;
-       _rpmds_unspecified_epoch_noise = save_noise;
     }
     if (qva->qva_flags & VERIFY_FILES) {
        if ((rc = verifyHeader(qva, ts, h)) != 0)