From 0abb4b72c31bbdc17e65103c5913ef1652ce7357 Mon Sep 17 00:00:00 2001 From: Sebastian Luther Date: Tue, 25 May 2010 12:18:28 +0200 Subject: Make parent_use parameter for portage.dep.Atom.violated_conditionals() optional (for evaluated atoms) --- pym/_emerge/depgraph.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pym/_emerge/depgraph.py') diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 3a35e84e9..ff561f7fa 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2269,9 +2269,8 @@ class depgraph(object): # Lets see if the violated use deps are conditional. # If so, suggest to change them on the parent. mreasons = [] - violated_atom = atom.unevaluated_atom.violated_conditionals(myparent.use.enabled, pkg.use.enabled) - if violated_atom.use and not \ - (violated_atom.use.enabled or violated_atom.use.disabled): + violated_atom = atom.unevaluated_atom.violated_conditionals(pkg.use.enabled, myparent.use.enabled) + if not (violated_atom.use.enabled or violated_atom.use.disabled): #all violated use deps are conditional changes = [] conditional = violated_atom.use.conditional -- cgit v1.2.3-1-g7c22