From e8a545b13565be4bfd8dd066eb42cdfdd2f55bd2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 12 Jan 2009 08:20:47 +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. (trunk r12403) svn path=/main/branches/2.1.6/; revision=12463 --- pym/_emerge/__init__.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index dbdd64600..c6a9323ea 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -3730,6 +3730,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-1-g7c22