From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 30 Apr 2009 07:16:44 +0000 (-0000)
Subject: Simplify pkgcmp(). Thanks to Douglas Anderson <dja@gendja.com> for this patch
X-Git-Tag: v2.1.6.12~63
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=748d96a8fc64824a8a1c136680a5e0ff1835389c;p=portage.git

Simplify pkgcmp(). Thanks to Douglas Anderson <dja@gendja.com> for this patch
from bug #266493. (trunk r13354)

svn path=/main/branches/2.1.6/; revision=13510
---

diff --git a/pym/portage/versions.py b/pym/portage/versions.py
index 13ce47897..299988061 100644
--- a/pym/portage/versions.py
+++ b/pym/portage/versions.py
@@ -203,15 +203,7 @@ def pkgcmp(pkg1, pkg2):
 	"""
 	if pkg1[0] != pkg2[0]:
 		return None
-	mycmp = vercmp("-".join(pkg1[1:]), "-".join(pkg2[1:]))
-	if mycmp is None:
-		return mycmp
-	if mycmp > 0:
-		return 1
-	if mycmp < 0:
-		return -1
-	return 0
-
+	return vercmp("-".join(pkg1[1:]), "-".join(pkg2[1:]))
 
 pkgcache={}