diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-08-17 18:19:02 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-08-17 18:19:02 +0000 |
| commit | d97c0533f2d3594c36f4b7094883ab6055c7db5b (patch) | |
| tree | 670f337e91ad50d533c363c13a19eb095d91c940 | |
| parent | Make etc-update copy owner and group bits when it merges config files. (branc... (diff) | |
| download | portage-2.1.2.12.tar.gz portage-2.1.2.12.tar.bz2 portage-2.1.2.12.zip | |
For bug #189219, use pkgcmp() to sort versions in selected/protected/omitted unmerge display. (branches/2.1.2 r7640)v2.1.2.12
svn path=/main/branches/2.1.2.9/; revision=7641
| -rwxr-xr-x | bin/emerge | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/bin/emerge b/bin/emerge index 5396c3dcb..a681ca0e8 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3668,12 +3668,14 @@ def unmerge(settings, myopts, vartree, unmerge_action, unmerge_files, for mytype in ["selected","protected","omitted"]: 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) |