summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-09-08 13:35:16 -0700
committerZac Medico <zmedico@gentoo.org>2010-09-08 13:35:16 -0700
commit9ab2783b73c24195789a9575aa11c4aa8141b564 (patch)
tree93eb7c6e8c4133d8b4268eb9a05dc4c3631b7de4
parented1fd651aa0fe8147fe5fea90c307726b6122a55 (diff)
downloadportage-9ab2783b73c24195789a9575aa11c4aa8141b564.tar.gz
portage-9ab2783b73c24195789a9575aa11c4aa8141b564.tar.bz2
portage-9ab2783b73c24195789a9575aa11c4aa8141b564.zip
Fix dep_zapdeps() to handle satisfied or optional builttime deps
appropriately.
-rw-r--r--pym/portage/dep/dep_check.py3
1 files changed, 2 insertions, 1 deletions
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