From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 8 Sep 2010 20:35:16 +0000 (-0700)
Subject: Fix dep_zapdeps() to handle satisfied or optional builttime deps
X-Git-Tag: v2.2_rc78~3
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9ab2783b73c24195789a9575aa11c4aa8141b564;p=portage.git

Fix dep_zapdeps() to handle satisfied or optional builttime deps
appropriately.
---

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