summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-05-25 01:20:37 -0700
committerZac Medico <zmedico@gentoo.org>2010-05-25 01:20:37 -0700
commite0271a98e8ca2ebc6d3f6fd9922f8ec732b723f5 (patch)
tree8b34067b68ada8d378de6d88a4579de999cc101f
parent_emerge.depgraph._show_slot_collision_notice(): Improve atom list prunning (diff)
downloadportage-idfetch-e0271a98e8ca2ebc6d3f6fd9922f8ec732b723f5.tar.gz
portage-idfetch-e0271a98e8ca2ebc6d3f6fd9922f8ec732b723f5.tar.bz2
portage-idfetch-e0271a98e8ca2ebc6d3f6fd9922f8ec732b723f5.zip
Fix traceback in _show_unsatisfied_dep, reported on forums:
http://forums.gentoo.org/viewtopic-t-829445.html?sid=58b3b5cec88b8e2ffebc9991c90a473e File "/usr/lib/portage/pym/_emerge/depgraph.py", line 2273, in _show_unsatisfied_dep if not (violated_atom.use.enabled or violated_atom.use.disabled): AttributeError: 'NoneType' object has no attribute 'enabled'
-rw-r--r--pym/_emerge/depgraph.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index c8b46039..3a35e84e 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2270,7 +2270,8 @@ class depgraph(object):
# If so, suggest to change them on the parent.
mreasons = []
violated_atom = atom.unevaluated_atom.violated_conditionals(myparent.use.enabled, pkg.use.enabled)
- if not (violated_atom.use.enabled or violated_atom.use.disabled):
+ if violated_atom.use and not \
+ (violated_atom.use.enabled or violated_atom.use.disabled):
#all violated use deps are conditional
changes = []
conditional = violated_atom.use.conditional