diff options
author | Zac Medico <zmedico@gentoo.org> | 2012-05-13 14:42:08 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2012-05-13 14:42:08 -0700 |
commit | 89b320a22b7e2504d00e18475e07e43ab56f2ad3 (patch) | |
tree | 075ae2c3e32137919b46281cc09362d3d61f4565 /bin | |
parent | 0f8b7f25d2fc2b7e4571d2e739e80ec2538d3a3f (diff) | |
download | portage-89b320a22b7e2504d00e18475e07e43ab56f2ad3.tar.gz portage-89b320a22b7e2504d00e18475e07e43ab56f2ad3.tar.bz2 portage-89b320a22b7e2504d00e18475e07e43ab56f2ad3.zip |
egencache: use vercmp instead of pkgcmp
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/egencache | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/egencache b/bin/egencache index 13860bca0..2f53b40e3 100755 --- a/bin/egencache +++ b/bin/egencache @@ -1,5 +1,5 @@ #!/usr/bin/python -# Copyright 2009-2011 Gentoo Foundation +# Copyright 2009-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import print_function @@ -42,7 +42,7 @@ from portage.manifest import guessManifestFileType from portage.util import cmp_sort_key, writemsg_level from portage import cpv_getkey from portage.dep import Atom, isjustname -from portage.versions import pkgcmp, pkgsplit, vercmp +from portage.versions import pkgsplit, vercmp try: from xml.etree import ElementTree @@ -570,7 +570,7 @@ class GenUseLocalDesc(object): return cmp_func(atomb.operator, atoma.operator) # Version matching elif atoma.cpv != atomb.cpv: - return pkgcmp(pkgsplit(atoma.cpv), pkgsplit(atomb.cpv)) + return vercmp(atoma.version, atomb.version) # Versions match, let's fallback to operator matching else: return cmp_func(ops.get(atoma.operator, -1), |