diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-01-09 22:25:50 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-01-09 22:25:50 +0000 |
| commit | 9e98eaf4444fc4d63d89a66b92afbf764d4b9b42 (patch) | |
| tree | 38239cf26e1652302ac0fd102bdd395bdd85480c /pym/_emerge | |
| parent | 1a9726b31cc0326ede10a45b02294931d1db7473 (diff) | |
| download | portage-9e98eaf4444fc4d63d89a66b92afbf764d4b9b42.tar.gz portage-9e98eaf4444fc4d63d89a66b92afbf764d4b9b42.tar.bz2 portage-9e98eaf4444fc4d63d89a66b92afbf764d4b9b42.zip | |
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
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/__init__.py | 9 |
1 files changed, 9 insertions, 0 deletions
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) |