| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-30 07:16:44 +0000 (Thu, 30 Apr 2009) |
| 3 |
New Revision: 13510 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/pym/portage/versions.py |
| 7 |
Log: |
| 8 |
Simplify pkgcmp(). Thanks to Douglas Anderson <dja@××××××.com> for this patch |
| 9 |
from bug #266493. (trunk r13354) |
| 10 |
|
| 11 |
Modified: main/branches/2.1.6/pym/portage/versions.py |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.6/pym/portage/versions.py 2009-04-30 07:16:36 UTC (rev 13509) |
| 14 |
+++ main/branches/2.1.6/pym/portage/versions.py 2009-04-30 07:16:44 UTC (rev 13510) |
| 15 |
@@ -203,16 +203,8 @@ |
| 16 |
""" |
| 17 |
if pkg1[0] != pkg2[0]: |
| 18 |
return None |
| 19 |
- mycmp = vercmp("-".join(pkg1[1:]), "-".join(pkg2[1:])) |
| 20 |
- if mycmp is None: |
| 21 |
- return mycmp |
| 22 |
- if mycmp > 0: |
| 23 |
- return 1 |
| 24 |
- if mycmp < 0: |
| 25 |
- return -1 |
| 26 |
- return 0 |
| 27 |
+ return vercmp("-".join(pkg1[1:]), "-".join(pkg2[1:])) |
| 28 |
|
| 29 |
- |
| 30 |
pkgcache={} |
| 31 |
|
| 32 |
def pkgsplit(mypkg,silent=1): |
Archives