diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2007-10-24 10:31:42 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2007-10-24 10:31:42 +0300 |
| commit | b2e90be34639db2fd39b00305ae6e60aac8b6329 (patch) | |
| tree | 28fbfcf0c79a2a63c1cbbb05e1289a229cd0262d | |
| parent | 19330086994ef02b8dcc18e71087b5c34110801d (diff) | |
| download | rpm-b2e90be34639db2fd39b00305ae6e60aac8b6329.tar.gz rpm-b2e90be34639db2fd39b00305ae6e60aac8b6329.tar.bz2 rpm-b2e90be34639db2fd39b00305ae6e60aac8b6329.zip | |
Use NEVRA, not NEVR everywhere for rpmProblems
| -rw-r--r-- | lib/rpmfi.c | 2 | ||||
| -rw-r--r-- | lib/rpmts.c | 4 | ||||
| -rw-r--r-- | lib/transaction.c | 18 |
3 files changed, 12 insertions, 12 deletions
diff --git a/lib/rpmfi.c b/lib/rpmfi.c index 8eece5a14..de04533c3 100644 --- a/lib/rpmfi.c +++ b/lib/rpmfi.c @@ -721,7 +721,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 886723792..e2e77df9c 100644 --- a/lib/rpmts.c +++ b/lib/rpmts.c @@ -1266,14 +1266,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 ceb891d47..63a11456d 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -111,7 +111,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; } @@ -187,7 +187,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); @@ -543,9 +543,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); } } @@ -639,9 +639,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); @@ -1425,14 +1425,14 @@ rpmlog(RPMLOG_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); @@ -1461,7 +1461,7 @@ rpmlog(RPMLOG_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); break; |