From: Zac Medico Date: Sun, 10 Jul 2011 13:33:23 +0000 (-0700) Subject: circular_dependency: fix total_flags calc X-Git-Tag: v2.2.0_alpha44~27 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c36a0214d9690f893341d199a834c8ffc506d5bd;p=portage.git circular_dependency: fix total_flags calc --- 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)