summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-05-13 20:05:14 +0000
committerZac Medico <zmedico@gentoo.org>2008-05-13 20:05:14 +0000
commit19faec9972e5ac014f302a999fa4391155a6face (patch)
tree9477732943ac5d6d81cbf7ce7de8a11838258b4a
parentfe1ce1f98c7095d559e6b7a7384ca97063ec45c0 (diff)
downloadportage-19faec9972e5ac014f302a999fa4391155a6face.tar.gz
portage-19faec9972e5ac014f302a999fa4391155a6face.tar.bz2
portage-19faec9972e5ac014f302a999fa4391155a6face.zip
Check vercmp() return value to avoid arbitrary results in case it returns None
(trunk r10322) svn path=/main/branches/2.1.2/; revision=10323
-rw-r--r--pym/portage_versions.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/portage_versions.py b/pym/portage_versions.py
index 6cf7a1998..ff31fbd4e 100644
--- a/pym/portage_versions.py
+++ b/pym/portage_versions.py
@@ -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