From eca826bd3aa70697955ebcd035cf939efd7ab8db Mon Sep 17 00:00:00 2001 From: Sebastian Luther Date: Sun, 11 Jul 2010 09:26:33 +0200 Subject: emerge --info: show package names for providing packages --- pym/_emerge/actions.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 2e4994a22..35923929a 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -1272,14 +1272,23 @@ def action_info(settings, trees, myopts, myfiles): for cpv in pkg_matches: ver = portage.versions.cpv_getversion(cpv) repo = vardb.aux_get(cpv, ["repository"])[0] - if not repo: - repo = "" - if repo != main_repo: - versions.append(ver + "::" + repo) + if repo == main_repo: + repo_suffix = "" + elif not repo: + repo_suffix = "::" else: - versions.append(ver) + repo_suffix = "::" + repo + + matched_cp = portage.versions.cpv_getkey(cpv) + if matched_cp == x: + provide_suffix = "" + else: + provide_suffix = " (%s)" % matched_cp + + versions.append(ver + repo_suffix + provide_suffix) - versions.sort(cmp=lambda a,b: portage.versions.vercmp(a.split("::")[0], b.split("::")[0])) + versions.sort(cmp=lambda a,b: portage.versions.vercmp( \ + a.split()[0].split("::")[0], b.split()[0].split("::")[0])) if versions: versions = ", ".join(versions) -- cgit v1.2.3-1-g7c22