From: Anas Nashif <anas.nashif@intel.com>
Date: Thu, 11 Oct 2012 19:31:15 +0000 (-0700)
Subject: compate name and version
X-Git-Tag: accepted/trunk/20130203.005124~74
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5300b55f775a6696db5b8d6cac909433728b516f;p=platform%2Fupstream%2Frpm.git

compate name and version

Also compare the name and not only the version when checking if
two packages are the same. rh#104066
---

diff --git a/lib/depends.c b/lib/depends.c
index 6539396..fa11725 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -144,6 +144,24 @@ static int skipColor(rpm_color_t tscolor, rpm_color_t color, rpm_color_t ocolor)
     return tscolor && color && ocolor && !(color & ocolor);
 }
 
+static int rpmNameVersionCompare(Header first, Header second)
+{
+    const char * one, * two;
+    int rc;
+
+    one = headerGetString(first, RPMTAG_NAME);
+    two = headerGetString(second, RPMTAG_NAME);
+    rc = strcmp(one, two);
+    if (rc)
+	return rc;
+    one = headerGetString(first, RPMTAG_ARCH);
+    two = headerGetString(second, RPMTAG_ARCH);
+    rc = strcmp(one, two);
+    if (rc)
+	return rc;
+    return rpmVersionCompare(first, second);
+}
+
 /* Add erase elements for older packages of same color (if any). */
 static int addUpgradeErasures(rpmts ts, rpm_color_t tscolor,
 				rpmte p, rpm_color_t hcolor, Header h)
@@ -157,8 +175,8 @@ static int addUpgradeErasures(rpmts ts, rpm_color_t tscolor,
 	if (skipColor(tscolor, hcolor, headerGetNumber(oh, RPMTAG_HEADERCOLOR)))
 	    continue;
 
-	/* Skip packages that contain identical NEVR. */
-	if (rpmVersionCompare(h, oh) == 0)
+	/* Skip packages that contain identical NEVRA. */
+	if (rpmNameVersionCompare(h, oh) == 0)
 	    continue;
 
 	if (removePackage(ts, oh, p)) {