Check vercmp() return value to avoid arbitrary results in case it returns None
authorZac Medico <zmedico@gentoo.org>
Tue, 13 May 2008 20:05:14 +0000 (20:05 -0000)
committerZac Medico <zmedico@gentoo.org>
Tue, 13 May 2008 20:05:14 +0000 (20:05 -0000)
(trunk r10322)

svn path=/main/branches/2.1.2/; revision=10323

pym/portage_versions.py

index 6cf7a199829cc8181b4f47d3afc0f8c79a30b564..ff31fbd4e828d7dc11a5413b9070ef7306a889f5 100644 (file)
@@ -190,9 +190,11 @@ def pkgcmp(pkg1, pkg2):
        if pkg1[0] != pkg2[0]:
                return None
        mycmp = vercmp("-".join(pkg1[1:]), "-".join(pkg2[1:]))
-       if mycmp>0:
+       if mycmp is None:
+               return mycmp
+       if mycmp > 0:
                return 1
-       if mycmp<0:
+       if mycmp < 0:
                return -1
        return 0