From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 9 Jan 2009 22:25:50 +0000 (-0000)
Subject: When merging a package from an overlay, append 'from $repository' to the
X-Git-Tag: v2.2_rc21~27
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9e98eaf4444fc4d63d89a66b92afbf764d4b9b42;p=portage.git

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 c2bc09acc..476e2d9a1 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)