diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-01-11 11:41:55 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-01-11 11:41:55 +0000 |
| commit | aa0f91ba8b6da92a059830bc2d10c5c8552c733e (patch) | |
| tree | 35f8cc475b50816d8c01f0803760e80230ba34b6 /pym/portage_versions.py | |
| parent | 020d2ce7c8a81434de1d86d67e9594875720f3db (diff) | |
| download | portage-aa0f91ba8b6da92a059830bc2d10c5c8552c733e.tar.gz portage-aa0f91ba8b6da92a059830bc2d10c5c8552c733e.tar.bz2 portage-aa0f91ba8b6da92a059830bc2d10c5c8552c733e.zip | |
* Make pkgcmp() pass the ebuild revision directly into vercmp() since
there is code there to handle it already. This eliminates some
redundant revision comparison code. Thanks to peper for the patch.
* Add some vercmp() test cases for comparison of ebuild revisions.
(trunk r9178)
svn path=/main/branches/2.1.2/; revision=9182
Diffstat (limited to 'pym/portage_versions.py')
| -rw-r--r-- | pym/portage_versions.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/pym/portage_versions.py b/pym/portage_versions.py index cf8d20d4f..6cf7a1998 100644 --- a/pym/portage_versions.py +++ b/pym/portage_versions.py @@ -189,17 +189,11 @@ def pkgcmp(pkg1, pkg2): """ if pkg1[0] != pkg2[0]: return None - mycmp=vercmp(pkg1[1],pkg2[1]) + mycmp = vercmp("-".join(pkg1[1:]), "-".join(pkg2[1:])) if mycmp>0: return 1 if mycmp<0: return -1 - r1=float(pkg1[2][1:]) - r2=float(pkg2[2][1:]) - if r1>r2: - return 1 - if r2>r1: - return -1 return 0 |