projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
84d7468
)
circular_dependency: fix total_flags calc
author
Zac Medico
<zmedico@gentoo.org>
Sun, 10 Jul 2011 13:33:23 +0000
(06:33 -0700)
committer
Zac Medico
<zmedico@gentoo.org>
Sun, 10 Jul 2011 13:33:23 +0000
(06:33 -0700)
pym/_emerge/resolver/circular_dependency.py
patch
|
blob
|
history
diff --git
a/pym/_emerge/resolver/circular_dependency.py
b/pym/_emerge/resolver/circular_dependency.py
index e4d679f0fe7774d5752ee5546721bf87fc7b5f9d..d113c5e8bb510e49771142aeb6abb6fd8e335abc 100644
(file)
--- 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)