| 1 |
commit: a5152139f76cdf605a26aa286c8fa2383bef8738 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 13 22:35:16 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 13 22:35:16 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a5152139 |
| 7 |
|
| 8 |
unmerge: use cpv_sort_key instead of pkgcmp |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/unmerge.py | 22 ++++++++++++---------- |
| 12 |
1 files changed, 12 insertions(+), 10 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py |
| 15 |
index 89eae08..b46b89c 100644 |
| 16 |
--- a/pym/_emerge/unmerge.py |
| 17 |
+++ b/pym/_emerge/unmerge.py |
| 18 |
@@ -13,7 +13,7 @@ from portage.dbapi._expand_new_virt import expand_new_virt |
| 19 |
from portage.output import bold, colorize, darkgreen, green |
| 20 |
from portage._sets import SETPREFIX |
| 21 |
from portage._sets.base import EditablePackageSet |
| 22 |
-from portage.util import cmp_sort_key |
| 23 |
+from portage.versions import cpv_sort_key, _pkg_str |
| 24 |
|
| 25 |
from _emerge.emergelog import emergelog |
| 26 |
from _emerge.Package import Package |
| 27 |
@@ -468,20 +468,22 @@ def _unmerge_display(root_config, myopts, unmerge_action, |
| 28 |
if not quiet: |
| 29 |
writemsg_level((mytype + ": ").rjust(14), noiselevel=-1) |
| 30 |
if pkgmap[x][mytype]: |
| 31 |
- sorted_pkgs = [portage.catpkgsplit(mypkg)[1:] for mypkg in pkgmap[x][mytype]] |
| 32 |
- sorted_pkgs.sort(key=cmp_sort_key(portage.pkgcmp)) |
| 33 |
- for pn, ver, rev in sorted_pkgs: |
| 34 |
- if rev == "r0": |
| 35 |
- myversion = ver |
| 36 |
- else: |
| 37 |
- myversion = ver + "-" + rev |
| 38 |
+ sorted_pkgs = [] |
| 39 |
+ for mypkg in pkgmap[x][mytype]: |
| 40 |
+ try: |
| 41 |
+ sorted_pkgs.append(mypkg.cpv) |
| 42 |
+ except AttributeError: |
| 43 |
+ sorted_pkgs.append(_pkg_str(mypkg)) |
| 44 |
+ sorted_pkgs.sort(key=cpv_sort_key()) |
| 45 |
+ for mypkg in sorted_pkgs: |
| 46 |
if mytype == "selected": |
| 47 |
writemsg_level( |
| 48 |
- colorize("UNMERGE_WARN", myversion + " "), |
| 49 |
+ colorize("UNMERGE_WARN", mypkg.version + " "), |
| 50 |
noiselevel=-1) |
| 51 |
else: |
| 52 |
writemsg_level( |
| 53 |
- colorize("GOOD", myversion + " "), noiselevel=-1) |
| 54 |
+ colorize("GOOD", mypkg.version + " "), |
| 55 |
+ noiselevel=-1) |
| 56 |
else: |
| 57 |
writemsg_level("none ", noiselevel=-1) |
| 58 |
if not quiet: |
Archives