projects
/
portage.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1a2b3bd
)
Fix breakage from last commit.
author
Zac Medico
<zmedico@gentoo.org>
Mon, 7 Nov 2011 18:33:47 +0000
(10:33 -0800)
committer
Zac Medico
<zmedico@gentoo.org>
Mon, 7 Nov 2011 18:34:28 +0000
(10:34 -0800)
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 62d555634b2d1c2a3b501c53dbcae0a196b44109..aca81face5b5b982c7b2101f6e2e2e8e84298429 100644
(file)
--- a/
pym/_emerge/resolver/circular_dependency.py
+++ b/
pym/_emerge/resolver/circular_dependency.py
@@
-186,7
+186,7
@@
class circular_dependency_handler(object):
parent_atom not in reduced_dep:
#We found an assignment that removes the atom from 'dep'.
#Make sure it doesn't conflict with REQUIRED_USE.
- required_use = parent.metadata.get("REQUIRED_USE", "")
]
+ required_use = parent.metadata.get("REQUIRED_USE", "")
if check_required_use(required_use, current_use, parent.iuse.is_valid_flag):
use = self.depgraph._pkg_use_enabled(parent)