summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2013-02-11 19:24:57 -0800
committerZac Medico <zmedico@gentoo.org>2013-02-11 19:24:57 -0800
commite0bda3c5aaa19799ba297c30c6673f21c6483430 (patch)
treeba22c05c7eaf95275c24ede9eac4f2cf8222b41d
parentSlotOperatorUnsolvedTestCase: add unwanted binpkg (diff)
downloadportage-e0bda3c5aaa19799ba297c30c6673f21c6483430.tar.gz
portage-e0bda3c5aaa19799ba297c30c6673f21c6483430.tar.bz2
portage-e0bda3c5aaa19799ba297c30c6673f21c6483430.zip
_get_dep_chain: include repo namesv2.2.0_alpha162
-rw-r--r--pym/_emerge/depgraph.py14
1 files changed, 12 insertions, 2 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index eb88357e1..06a9a46d1 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -3388,6 +3388,15 @@ class depgraph(object):
child = None
all_parents = self._dynamic_config._parent_atoms
graph = self._dynamic_config.digraph
+ verbose_main_repo_display = "--verbose-main-repo-display" in \
+ self._frozen_config.myopts
+
+ def format_pkg(pkg):
+ pkg_name = "%s" % (pkg.cpv,)
+ if verbose_main_repo_display or pkg.repo != \
+ pkg.root_config.settings.repositories.mainRepo().name:
+ pkg_name += _repo_separator + pkg.repo
+ return pkg_name
if target_atom is not None and isinstance(node, Package):
affecting_use = set()
@@ -3400,7 +3409,8 @@ class depgraph(object):
if not node.installed:
raise
affecting_use.difference_update(node.use.mask, node.use.force)
- pkg_name = "%s" % (node.cpv,)
+ pkg_name = format_pkg(node)
+
if affecting_use:
usedep = []
for flag in affecting_use:
@@ -3497,7 +3507,7 @@ class depgraph(object):
affecting_use.difference_update(node.use.mask, \
node.use.force)
- pkg_name = "%s" % (node.cpv,)
+ pkg_name = format_pkg(node)
if affecting_use:
usedep = []
for flag in affecting_use: