diff options
Diffstat (limited to 'pym/_emerge/MergeListItem.py')
| -rw-r--r-- | pym/_emerge/MergeListItem.py | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/pym/_emerge/MergeListItem.py b/pym/_emerge/MergeListItem.py index 8086c689a..938f8014a 100644 --- a/pym/_emerge/MergeListItem.py +++ b/pym/_emerge/MergeListItem.py @@ -1,7 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from portage import os +from portage.dep import _repo_separator from portage.output import colorize from _emerge.AsynchronousTask import AsynchronousTask @@ -32,7 +33,7 @@ class MergeListItem(CompositeTask): if pkg.installed: # uninstall, executed by self.merge() self.returncode = os.EX_OK - self.wait() + self._async_wait() return args_set = self.args_set @@ -47,7 +48,9 @@ class MergeListItem(CompositeTask): action_desc = "Emerging" preposition = "for" + pkg_color = "PKG_MERGE" if pkg.type_name == "binary": + pkg_color = "PKG_BINARY_MERGE" action_desc += " binary" if build_opts.fetchonly: @@ -57,16 +60,7 @@ class MergeListItem(CompositeTask): (action_desc, colorize("MERGE_LIST_PROGRESS", str(pkg_count.curval)), colorize("MERGE_LIST_PROGRESS", str(pkg_count.maxval)), - colorize("GOOD", pkg.cpv)) - - portdb = pkg.root_config.trees["porttree"].dbapi - portdir_repo_name = portdb.getRepositoryName(portdb.porttree_root) - if portdir_repo_name: - pkg_repo_name = pkg.repo - if pkg_repo_name != portdir_repo_name: - if pkg_repo_name == pkg.UNKNOWN_REPO: - pkg_repo_name = "unknown repo" - msg += " from %s" % pkg_repo_name + colorize(pkg_color, pkg.cpv + _repo_separator + pkg.repo)) if pkg.root_config.settings["ROOT"] != "/": msg += " %s %s" % (preposition, pkg.root) |