From 9ab2783b73c24195789a9575aa11c4aa8141b564 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 8 Sep 2010 13:35:16 -0700 Subject: Fix dep_zapdeps() to handle satisfied or optional builttime deps appropriately. --- pym/portage/dep/dep_check.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pym') diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py index cdedf7920..fca1594a7 100644 --- a/pym/portage/dep/dep_check.py +++ b/pym/portage/dep/dep_check.py @@ -383,7 +383,8 @@ def dep_zapdeps(unreduced, reduced, myroot, use_binaries=0, trees=None): if all_in_graph: if parent is None or priority is None: pass - elif priority.buildtime: + elif priority.buildtime and \ + not (priority.satisfied or priority.optional): # Check if the atom would result in a direct circular # dependency and try to avoid that if it seems likely # to be unresolvable. This is only relevant for -- cgit v1.2.3-1-g7c22