sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remark: we don't print the disttag

Browse Source
This commit is contained in:
Ivan Zakharyaschev 2019-02-25 08:20:37 +03:00
parent 3c72c222d5
commit e805931cf3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/verify.c
View File

@ -475,7 +475,7 @@ static int verifyDependencies(rpmdb rpmdb, Header h)
const char *n, *v, *r; const char *n, *v, *r;
char * t, * te; char * t, * te;
int nb = 512; int nb = 512;
(void) headerNVR(h, &n, &v, &r); (void) headerNVRD(h, &n, &v, &r, NULL); // we don't print the disttag
int i; int i;
for (i = 0; i < numConflicts; i++) { for (i = 0; i < numConflicts; i++) {
@ -523,7 +523,7 @@ int showVerifyPackage(QVA_t qva, rpmdb rpmdb, Header h)
if (qva->qva_flags & VERIFY_DIGEST) { if (qva->qva_flags & VERIFY_DIGEST) {
if ((rc = rpmVerifyDigest(h)) != 0) { if ((rc = rpmVerifyDigest(h)) != 0) {
const char *n, *v, *r; const char *n, *v, *r;
(void) headerNVR(h, &n, &v, &r); (void) headerNVRD(h, &n, &v, &r, NULL); // we don't print the disttag
rpmMessage(RPMMESS_NORMAL, rpmMessage(RPMMESS_NORMAL,
_("%s-%s-%s: immutable header region digest check failed\n"), _("%s-%s-%s: immutable header region digest check failed\n"),
n, v, r); n, v, r);

6
rpmdb/rpmdb.c
View File

@ -2041,7 +2041,7 @@ exit:
#ifdef NOTNOW #ifdef NOTNOW
if (mi->mi_h) { if (mi->mi_h) {
const char *n, *v, *r; const char *n, *v, *r;
(void) headerNVR(mi->mi_h, &n, &v, &r); (void) headerNVRD(mi->mi_h, &n, &v, &r, NULL); // we don't print the disttag
rpmMessage(RPMMESS_DEBUG, "%s-%s-%s at 0x%x, h %p\n", n, v, r, rpmMessage(RPMMESS_DEBUG, "%s-%s-%s at 0x%x, h %p\n", n, v, r,
mi->mi_offset, mi->mi_h); mi->mi_offset, mi->mi_h);
} }
@ -2312,7 +2312,7 @@ int rpmdbRemove(rpmdb db, /*@unused@*/ int rid, unsigned int hdrNum)
#endif #endif
{ const char *n, *v, *r; { const char *n, *v, *r;
(void) headerNVR(h, &n, &v, &r); (void) headerNVRD(h, &n, &v, &r, NULL); // we don't print the disttag
rpmMessage(RPMMESS_DEBUG, " --- %10u %s-%s-%s\n", hdrNum, n, v, r); rpmMessage(RPMMESS_DEBUG, " --- %10u %s-%s-%s\n", hdrNum, n, v, r);
} }
@ -2646,7 +2646,7 @@ int rpmdbAdd(rpmdb db, int iid, Header h)
if (!dbi->dbi_no_dbsync) if (!dbi->dbi_no_dbsync)
xx = dbiSync(dbi, 0); xx = dbiSync(dbi, 0);
{ const char *n, *v, *r; { const char *n, *v, *r;
xx = headerNVR(h, &n, &v, &r); xx = headerNVRD(h, &n, &v, &r, NULL); // we don't print the disttag
rpmMessage(RPMMESS_DEBUG, " +++ %10u %s-%s-%s\n", hdrNum, n, v, r); rpmMessage(RPMMESS_DEBUG, " +++ %10u %s-%s-%s\n", hdrNum, n, v, r);
} }
} }