Use NEVRA, not NEVR everywhere for rpmProblems

(transplanted from 4474dd02c53edf7ce68412b435dbcd6f6322696d)

diff --git a/lib/rpmfi.c b/lib/rpmfi.c
index b0b0615..13c682f 100644 (file)
--- a/lib/rpmfi.c
+++ b/lib/rpmfi.c
@@ -815,7 +815,7 @@ assert(p != NULL);
            if (j == numValid && !allowBadRelocate && actions) {
                rpmps ps = rpmtsProblems(ts);
                rpmpsAppend(ps, RPMPROB_BADRELOCATE,
-                       rpmteNEVR(p), rpmteKey(p),
+                       rpmteNEVRA(p), rpmteKey(p),
                        relocations[i].oldPath, NULL, NULL, 0);
                ps = rpmpsFree(ps);
            }

diff --git a/lib/rpmts.c b/lib/rpmts.c
index 0a1f202..ff237bb 100644 (file)
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -1356,14 +1356,14 @@ void rpmtsCheckDSIProblems(const rpmts ts, const rpmte te)
 
        if (dsi->bavail >= 0 && adj_fs_blocks(dsi->bneeded) > dsi->bavail) {
            rpmpsAppend(ps, RPMPROB_DISKSPACE,
-                       rpmteNEVR(te), rpmteKey(te),
+                       rpmteNEVRA(te), rpmteKey(te),
                        ts->filesystems[i], NULL, NULL,
           (adj_fs_blocks(dsi->bneeded) - dsi->bavail) * dsi->bsize);
        }
 
        if (dsi->iavail >= 0 && adj_fs_blocks(dsi->ineeded) > dsi->iavail) {
            rpmpsAppend(ps, RPMPROB_DISKNODES,
-                       rpmteNEVR(te), rpmteKey(te),
+                       rpmteNEVRA(te), rpmteKey(te),
                        ts->filesystems[i], NULL, NULL,
            (adj_fs_blocks(dsi->ineeded) - dsi->iavail));
        }

diff --git a/lib/transaction.c b/lib/transaction.c
index f14e541..5ffcf0f 100644 (file)
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -138,7 +138,7 @@ static int handleInstInstalledFiles(const rpmts ts,
        mi = rpmtsInitIterator(ts, RPMDBI_PACKAGES,
                        &shared->otherPkg, sizeof(shared->otherPkg));
        while ((h = rpmdbNextIterator(mi)) != NULL) {
-           altNEVR = hGetNEVR(h, NULL);
+           altNEVR = hGetNEVRA(h, NULL);
            otherFi = rpmfiNew(ts, h, RPMTAG_BASENAMES, scareMem);
            break;
        }
@@ -214,7 +214,7 @@ static int handleInstInstalledFiles(const rpmts ts,
 
            if (rConflicts) {
                rpmpsAppend(ps, RPMPROB_FILE_CONFLICT,
-                       rpmteNEVR(p), rpmteKey(p),
+                       rpmteNEVRA(p), rpmteKey(p),
                        rpmfiDN(fi), rpmfiBN(fi),
                        altNEVR,
                        0);
@@ -603,9 +603,9 @@ assert(otherFi != NULL);
 
                if (rConflicts) {
                    rpmpsAppend(ps, RPMPROB_NEW_FILE_CONFLICT,
-                       rpmteNEVR(p), rpmteKey(p),
+                       rpmteNEVRA(p), rpmteKey(p),
                        fn, NULL,
-                       rpmteNEVR(otherFi->te),
+                       rpmteNEVRA(otherFi->te),
                        0);
                }
            }
@@ -703,9 +703,9 @@ static int ensureOlder(rpmts ts,
 
     if (rc == 0) {
        rpmps ps = rpmtsProblems(ts);
-       const char * altNEVR = hGetNEVR(h, NULL);
+       const char * altNEVR = hGetNEVRA(h, NULL);
        rpmpsAppend(ps, RPMPROB_OLDPACKAGE,
-               rpmteNEVR(p), rpmteKey(p),
+               rpmteNEVRA(p), rpmteKey(p),
                NULL, NULL,
                altNEVR,
                0);
@@ -1508,14 +1508,14 @@ rpmMessage(RPMMESS_DEBUG, _("sanity checking %d elements\n"), rpmtsNElements(ts)
        if (!(rpmtsFilterFlags(ts) & RPMPROB_FILTER_IGNOREARCH) && !tscolor)
            if (!archOkay(rpmteA(p)))
                rpmpsAppend(ps, RPMPROB_BADARCH,
-                       rpmteNEVR(p), rpmteKey(p),
+                       rpmteNEVRA(p), rpmteKey(p),
                        rpmteA(p), NULL,
                        NULL, 0);
 
        if (!(rpmtsFilterFlags(ts) & RPMPROB_FILTER_IGNOREOS))
            if (!osOkay(rpmteO(p)))
                rpmpsAppend(ps, RPMPROB_BADOS,
-                       rpmteNEVR(p), rpmteKey(p),
+                       rpmteNEVRA(p), rpmteKey(p),
                        rpmteO(p), NULL,
                        NULL, 0);
 
@@ -1544,7 +1544,7 @@ rpmMessage(RPMMESS_DEBUG, _("sanity checking %d elements\n"), rpmtsNElements(ts)
 
            while (rpmdbNextIterator(mi) != NULL) {
                rpmpsAppend(ps, RPMPROB_PKG_INSTALLED,
-                       rpmteNEVR(p), rpmteKey(p),
+                       rpmteNEVRA(p), rpmteKey(p),
                        NULL, NULL,
                        NULL, 0);
                /*@innerbreak@*/ break;