From 9e98eaf4444fc4d63d89a66b92afbf764d4b9b42 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 9 Jan 2009 22:25:50 +0000 Subject: When merging a package from an overlay, append 'from $repository' to the '>>> Emerging' message (where $repository is the repo_name of the source repository). Thanks to Jeroen Roovers for the suggestion. svn path=/main/trunk/; revision=12403 --- pym/_emerge/__init__.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index c2bc09ac..476e2d9a 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -3749,6 +3749,15 @@ class MergeListItem(CompositeTask): colorize("MERGE_LIST_PROGRESS", str(pkg_count.maxval)), colorize("GOOD", pkg.cpv)) + portdb = pkg.root_config.trees["porttree"].dbapi + portdir_repo_name = portdb._repository_map.get(portdb.porttree_root) + if portdir_repo_name: + pkg_repo_name = pkg.metadata["repository"] + if pkg_repo_name != portdir_repo_name: + if not pkg_repo_name: + pkg_repo_name = "unknown repo" + msg += " from %s" % pkg_repo_name + if pkg.root != "/": msg += " %s %s" % (preposition, pkg.root) -- cgit v1.2.3