diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-08-17 18:17:14 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-08-17 18:17:14 +0000 |
| commit | 74b6284e9c389f96c5d7b74f138a1cd9df163fdb (patch) | |
| tree | 014ab716b0fee4b27a3793a5f89a4556250eb85f | |
| parent | 8eef17d8a2e9dcfd839de13e90da036f44b3eff9 (diff) | |
| download | portage-74b6284e9c389f96c5d7b74f138a1cd9df163fdb.tar.gz portage-74b6284e9c389f96c5d7b74f138a1cd9df163fdb.tar.bz2 portage-74b6284e9c389f96c5d7b74f138a1cd9df163fdb.zip | |
For bug #189219, use pkgcmp() to sort versions in selected/protected/omitted unmerge display.
svn path=/main/trunk/; revision=7639
| -rw-r--r-- | pym/emerge/__init__.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 53a7a99c9..e92df3627 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -4140,12 +4140,14 @@ def unmerge(settings, myopts, vartree, unmerge_action, unmerge_files, if "--quiet" not in myopts: portage.writemsg_stdout((mytype + ": ").rjust(14), noiselevel=-1) if pkgmap[x][mytype]: - for mypkg in pkgmap[x][mytype]: - mysplit=portage.catpkgsplit(mypkg) - if mysplit[3]=="r0": - myversion=mysplit[2] + sorted_pkgs = [portage.catpkgsplit(mypkg)[1:] \ + for mypkg in pkgmap[x][mytype]] + sorted_pkgs.sort(portage.pkgcmp) + for pn, ver, rev in sorted_pkgs: + if rev == "r0": + myversion = ver else: - myversion=mysplit[2]+"-"+mysplit[3] + myversion = ver + "-" + rev if mytype=="selected": portage.writemsg_stdout( colorize("UNMERGE_WARN", myversion + " "), noiselevel=-1) |