[Rpm-maint] [PATCH 5/7] Replace NVRA and NEVRA with NVRDA and NEVRDA respectively everywhere it makes sense.

Vladimir D. Seleznev vseleznv at altlinux.org
Tue Oct 23 05:48:22 UTC 2018


Signed-off-by: Vladimir D. Seleznev <vseleznv at altlinux.org>
---
 lib/depends.c     | 24 ++++++++++++------------
 lib/rpmdb.c       |  6 +++---
 lib/rpminstall.c  |  2 +-
 lib/rpmscript.c   |  6 +++---
 lib/transaction.c |  4 ++--
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/lib/depends.c b/lib/depends.c
index 6e9866eae..4345f8b22 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -87,7 +87,7 @@ static rpmRC headerCheckPayloadFormat(Header h) {
     if (!payloadfmt) return rc;
 
     if (!rstreq(payloadfmt, "cpio")) {
-        char *nevra = headerGetAsString(h, RPMTAG_NEVRA);
+        char *nevra = headerGetAsString(h, RPMTAG_NEVRDA);
         if (payloadfmt && rstreq(payloadfmt, "drpm")) {
             rpmlog(RPMLOG_ERR,
                      _("%s is a Delta RPM and cannot be directly installed\n"),
@@ -226,9 +226,9 @@ static int addObsoleteErasures(rpmts ts, rpm_color_t tscolor, rpmte p)
 
 	    /* avoid self-obsoleting packages */
 	    if (rstreq(rpmteN(p), Name) && rstreq(rpmteA(p), oarch)) {
-		char * ohNEVRA = headerGetAsString(oh, RPMTAG_NEVRA);
-		rpmlog(RPMLOG_DEBUG, "  Not obsoleting: %s\n", ohNEVRA);
-		free(ohNEVRA);
+		char * ohNEVRDA = headerGetAsString(oh, RPMTAG_NEVRDA);
+		rpmlog(RPMLOG_DEBUG, "  Not obsoleting: %s\n", ohNEVRDA);
+		free(ohNEVRDA);
 		continue;
 	    }
 
@@ -242,10 +242,10 @@ static int addObsoleteErasures(rpmts ts, rpm_color_t tscolor, rpmte p)
 					 _rpmds_nopromote);
 
 	    if (match) {
-		char * ohNEVRA = headerGetAsString(oh, RPMTAG_NEVRA);
+		char * ohNEVRDA = headerGetAsString(oh, RPMTAG_NEVRDA);
 		rpmlog(RPMLOG_DEBUG, "  Obsoletes: %s\t\terases %s\n",
-			rpmdsDNEVR(obsoletes)+2, ohNEVRA);
-		free(ohNEVRA);
+			rpmdsDNEVR(obsoletes)+2, ohNEVRDA);
+		free(ohNEVRDA);
 
 		if (removePackage(ts, oh, p)) {
 		    rc = 1;
@@ -376,7 +376,7 @@ exit:
 	const char *msg = skip ?
 		    _("package %s was already added, skipping %s\n") :
 		    _("package %s was already added, replacing with %s\n");
-	rpmlog(RPMLOG_WARNING, msg, rpmteNEVRA(p), rpmteNEVRA(te));
+	rpmlog(RPMLOG_WARNING, msg, rpmteNEVRDA(p), rpmteNEVRDA(te));
     }
 
     /* If replacing a previous element, find out where it is. Pooh. */
@@ -870,7 +870,7 @@ static void checkInstDeps(rpmts ts, depCache dcache, rpmte te,
 	    match = rpmdsCompare(ds, depds);
 
 	if (match && unsatisfiedDepend(ts, dcache, ds) == is_problem) {
-	    char *pkgNEVRA = headerGetAsString(h, RPMTAG_NEVRA);
+	    char *pkgNEVRA = headerGetAsString(h, RPMTAG_NEVRDA);
 	    rpmteAddDepProblem(te, pkgNEVRA, ds, NULL);
 	    free(pkgNEVRA);
 	}
@@ -1057,11 +1057,11 @@ int rpmtsCheck(rpmts ts)
 	rpmlog(RPMLOG_DEBUG, "========== +++ %s %s/%s 0x%x\n",
 		rpmteNEVR(p), rpmteA(p), rpmteO(p), rpmteColor(p));
 
-	checkDS(ts, dcache, p, rpmteNEVRA(p), rpmteDS(p, RPMTAG_REQUIRENAME),
+	checkDS(ts, dcache, p, rpmteNEVRDA(p), rpmteDS(p, RPMTAG_REQUIRENAME),
 		tscolor);
-	checkDS(ts, dcache, p, rpmteNEVRA(p), rpmteDS(p, RPMTAG_CONFLICTNAME),
+	checkDS(ts, dcache, p, rpmteNEVRDA(p), rpmteDS(p, RPMTAG_CONFLICTNAME),
 		tscolor);
-	checkDS(ts, dcache, p, rpmteNEVRA(p), rpmteDS(p, RPMTAG_OBSOLETENAME),
+	checkDS(ts, dcache, p, rpmteNEVRDA(p), rpmteDS(p, RPMTAG_OBSOLETENAME),
 		tscolor);
 
 	/* Check provides against conflicts in installed packages. */
diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index c1fabe615..07b37c355 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -2110,9 +2110,9 @@ int rpmdbRemove(rpmdb db, unsigned int hdrNum)
 	      "rpmdbRemove", hdrNum);
 	return 1;
     } else {
-	char *nevra = headerGetAsString(h, RPMTAG_NEVRA);
-	rpmlog(RPMLOG_DEBUG, "  --- h#%8u %s\n", hdrNum, nevra);
-	free(nevra);
+	char *nevrda = headerGetAsString(h, RPMTAG_NEVRDA);
+	rpmlog(RPMLOG_DEBUG, "  --- h#%8u %s\n", hdrNum, nevrda);
+	free(nevrda);
     }
 
     if (pkgdbOpen(db, 0, &dbi))
diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index 724126e94..b888a3402 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -154,7 +154,7 @@ void * rpmShowProgress(const void * arg,
 	    (void) fflush(stdout);
 	    free(s);
 	} else {
-	    char *s = headerGetAsString(h, RPMTAG_NEVRA);
+	    char *s = headerGetAsString(h, RPMTAG_NEVRDA);
 	    fprintf(stdout, "%s\n", s);
 	    (void) fflush(stdout);
 	    free(s);
diff --git a/lib/rpmscript.c b/lib/rpmscript.c
index 8d5b531f6..2bb9210dd 100644
--- a/lib/rpmscript.c
+++ b/lib/rpmscript.c
@@ -473,13 +473,13 @@ static const char * tag2sln(rpmTagVal tag)
 static rpmScript rpmScriptNew(Header h, rpmTagVal tag, const char *body,
 			      rpmscriptFlags flags)
 {
-    char *nevra = headerGetAsString(h, RPMTAG_NEVRA);
+    char *nevrda = headerGetAsString(h, RPMTAG_NEVRDA);
     rpmScript script = xcalloc(1, sizeof(*script));
     script->tag = tag;
     script->type = getScriptType(tag);
     script->flags = getDefFlags(tag) | flags;
     script->body = (body != NULL) ? xstrdup(body) : NULL;
-    rasprintf(&script->descr, "%s(%s)", tag2sln(tag), nevra);
+    rasprintf(&script->descr, "%s(%s)", tag2sln(tag), nevrda);
 
     /* macros need to be expanded before possible queryformat */
     if (script->body && (script->flags & RPMSCRIPT_FLAG_EXPAND)) {
@@ -497,7 +497,7 @@ static rpmScript rpmScriptNew(Header h, rpmTagVal tag, const char *body,
     script->nextFileFunc.func = NULL;
     script->nextFileFunc.param = NULL;
 
-    free(nevra);
+    free(nevrda);
     return script;
 }
 
diff --git a/lib/transaction.c b/lib/transaction.c
index 3969ad3fc..06f6d69af 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -455,7 +455,7 @@ static void handleInstInstalledFile(const rpmts ts, rpmte p, rpmfiles fi, int fx
 	    rConflicts = 0;
 
 	if (rConflicts) {
-	    char *altNEVR = headerGetAsString(otherHeader, RPMTAG_NEVRA);
+	    char *altNEVR = headerGetAsString(otherHeader, RPMTAG_NEVRDA);
 	    char *fn = rpmfilesFN(fi, fx);
 	    rpmteAddProblem(p, RPMPROB_FILE_CONFLICT, altNEVR, fn,
 			    headerGetInstance(otherHeader));
@@ -721,7 +721,7 @@ static void ensureOlder(rpmstrPool tspool, const rpmte p, const Header h)
     req = rpmdsSinglePool(tspool, RPMTAG_REQUIRENAME,
 			  rpmteN(p), rpmteEVR(p), reqFlags);
     if (rpmdsMatches(tspool, h, -1, req, 1, _rpmds_nopromote) == 0) {
-	char * altNEVR = headerGetAsString(h, RPMTAG_NEVRA);
+	char * altNEVR = headerGetAsString(h, RPMTAG_NEVRDA);
 	rpmteAddProblem(p, RPMPROB_OLDPACKAGE, altNEVR, NULL,
 			headerGetInstance(h));
 	free(altNEVR);
-- 
2.17.2



More information about the Rpm-maint mailing list