diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-05-25 12:18:28 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-05-25 04:43:46 -0700 |
| commit | 0abb4b72c31bbdc17e65103c5913ef1652ce7357 (patch) | |
| tree | 2ce91ee80bc36e1aaec87257a6531bc395b05ea9 /pym/_emerge/depgraph.py | |
| parent | e0271a98e8ca2ebc6d3f6fd9922f8ec732b723f5 (diff) | |
| download | portage-0abb4b72c31bbdc17e65103c5913ef1652ce7357.tar.gz portage-0abb4b72c31bbdc17e65103c5913ef1652ce7357.tar.bz2 portage-0abb4b72c31bbdc17e65103c5913ef1652ce7357.zip | |
Make parent_use parameter for portage.dep.Atom.violated_conditionals() optional (for evaluated atoms)
Diffstat (limited to 'pym/_emerge/depgraph.py')
| -rw-r--r-- | pym/_emerge/depgraph.py | 5 |
1 files changed, 2 insertions, 3 deletions
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 |