summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-05-04 10:20:58 -0700
committerZac Medico <zmedico@gentoo.org>2011-05-04 10:20:58 -0700
commitaf430c8b439cf67079b54fa3b18312e0a6afce8d (patch)
treeeb91cd9f44bcea81ba49b299cc9d5b54c40aa664
parente4297ca1075342ec89e089802cd25ae0817f3d5b (diff)
downloadportage-af430c8b439cf67079b54fa3b18312e0a6afce8d.tar.gz
portage-af430c8b439cf67079b54fa3b18312e0a6afce8d.tar.bz2
portage-af430c8b439cf67079b54fa3b18312e0a6afce8d.zip
add_pkg_dep_string: respect traverse_ignored_deps
I don't think this makes any difference now, but it clarifies how traverse_ignored_deps should behave.
-rw-r--r--pym/_emerge/depgraph.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index ebfbdd498..9dcc5b96b 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -1543,7 +1543,8 @@ class depgraph(object):
self._dynamic_config._ignored_deps.append(dep)
if not ignored:
- if dep_priority.ignored:
+ if dep_priority.ignored and \
+ not self._dynamic_config._traverse_ignored_deps:
if is_virt and dep.child is not None:
traversed_virt_pkgs.add(dep.child)
dep.child = None
@@ -1573,7 +1574,8 @@ class depgraph(object):
(virt_pkg.cpv, [str(x) for x in atoms]),
noiselevel=-1, level=logging.DEBUG)
- if not dep_priority.ignored:
+ if not dep_priority.ignored or \
+ self._dynamic_config._traverse_ignored_deps:
if not self._add_pkg(virt_pkg, virt_dep):
return 0
@@ -1635,7 +1637,8 @@ class depgraph(object):
self._dynamic_config._ignored_deps.append(dep)
if not ignored:
- if dep_priority.ignored:
+ if dep_priority.ignored and \
+ not self._dynamic_config._traverse_ignored_deps:
if is_virt and dep.child is not None:
traversed_virt_pkgs.add(dep.child)
dep.child = None