|
 |
45e748 |
From 7e50b3f4b2ebb963d1080a0a1469517ef81f780c Mon Sep 17 00:00:00 2001
|
|
|
45e748 |
From: Jes Sorensen <jsorensen@fb.com>
|
|
|
45e748 |
Date: Tue, 14 Apr 2020 12:08:09 -0400
|
|
|
45e748 |
Subject: [PATCH 25/33] rpmsignverity.c: Clean up debug logging
|
|
|
45e748 |
|
|
|
45e748 |
Put most logging in one place and avoid printing the same info twice.
|
|
|
45e748 |
|
|
|
45e748 |
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
|
45e748 |
---
|
|
|
45e748 |
sign/rpmsignverity.c | 5 -----
|
|
|
45e748 |
1 file changed, 5 deletions(-)
|
|
|
45e748 |
|
|
|
45e748 |
diff --git a/sign/rpmsignverity.c b/sign/rpmsignverity.c
|
|
|
45e748 |
index 2c7d21620..445e1197c 100644
|
|
|
45e748 |
--- a/sign/rpmsignverity.c
|
|
|
45e748 |
+++ b/sign/rpmsignverity.c
|
|
|
45e748 |
@@ -104,7 +104,6 @@ rpmRC rpmSignVerity(FD_t fd, Header sigh, Header h, char *key,
|
|
|
45e748 |
rpmfi hfi = rpmfiNew(NULL, h, RPMTAG_BASENAMES, RPMFI_FLAGS_QUERY);
|
|
|
45e748 |
rpmts ts = rpmtsCreate();
|
|
|
45e748 |
struct rpmtd_s td;
|
|
|
45e748 |
- rpm_loff_t file_size;
|
|
|
45e748 |
off_t offset = Ftell(fd);
|
|
|
45e748 |
const char *compr;
|
|
|
45e748 |
char *rpmio_flags = NULL;
|
|
|
45e748 |
@@ -158,12 +157,8 @@ rpmRC rpmSignVerity(FD_t fd, Header sigh, Header h, char *key,
|
|
|
45e748 |
nr_files, rpmfiFC(fi));
|
|
|
45e748 |
|
|
|
45e748 |
while (rpmfiNext(fi) >= 0) {
|
|
|
45e748 |
- file_size = rpmfiFSize(fi);
|
|
|
45e748 |
idx = rpmfiFX(fi);
|
|
|
45e748 |
|
|
|
45e748 |
- rpmlog(RPMLOG_DEBUG, _("file: %s, (size %li, link %s, idx %i)\n"),
|
|
|
45e748 |
- rpmfiFN(fi), file_size, rpmfiFLink(fi), rpmfiFX(fi));
|
|
|
45e748 |
-
|
|
|
45e748 |
signatures[idx] = rpmVeritySignFile(fi, &sig_size, key, keypass, cert);
|
|
|
45e748 |
}
|
|
|
45e748 |
|
|
|
45e748 |
--
|
|
|
45e748 |
2.27.0
|
|
|
45e748 |
|