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 <jer@g.o> for the suggestion.

svn path=/main/trunk/; revision=12403

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index c2bc09acc7a2c533cb70d9ee3f9360d2e82d91ef..476e2d9a188534b7aa1e7e12109d8384d75e4faf 100644 (file)
--- 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)