summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-07-10 06:33:23 -0700
committerZac Medico <zmedico@gentoo.org>2011-07-10 06:33:23 -0700
commitc36a0214d9690f893341d199a834c8ffc506d5bd (patch)
tree1af10c4f4186d5c951e0fbd59b874df1e865ca9c
parent84d7468855226af62e7e156967b4211cc5782fd6 (diff)
downloadportage-c36a0214d9690f893341d199a834c8ffc506d5bd.tar.gz
portage-c36a0214d9690f893341d199a834c8ffc506d5bd.tar.bz2
portage-c36a0214d9690f893341d199a834c8ffc506d5bd.zip
circular_dependency: fix total_flags calc
-rw-r--r--pym/_emerge/resolver/circular_dependency.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/_emerge/resolver/circular_dependency.py b/pym/_emerge/resolver/circular_dependency.py
index e4d679f0f..d113c5e8b 100644
--- a/pym/_emerge/resolver/circular_dependency.py
+++ b/pym/_emerge/resolver/circular_dependency.py
@@ -152,9 +152,9 @@ class circular_dependency_handler(object):
# exponentially related (see bug #374397).
total_flags = set()
total_flags.update(affecting_use, required_use_flags)
+ total_flags.difference_update(untouchable_flags)
if len(total_flags) <= 10:
- affecting_use.update(required_use_flags)
- affecting_use.difference_update(untouchable_flags)
+ affecting_use = total_flags
affecting_use = tuple(affecting_use)