[gentoo-commits] proj/portage:master commit in: pym/_emerge/resolver/

["Zac Medico" <zmedico@gentoo.org>]

commit:     f085533e820e7dac48c5192aa0ae3b7fb887059d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 10:40:59 2011 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 10:40:59 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f085533e

slot_collision: fix AttributeError for bug 374423

---
 pym/_emerge/resolver/slot_collision.py |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py
index 0042997..0069d17 100644
--- a/pym/_emerge/resolver/slot_collision.py
+++ b/pym/_emerge/resolver/slot_collision.py
@@ -349,6 +349,20 @@ class slot_conflict_handler(object):
 										_pkg_use_enabled(other_pkg),
 										other_pkg.iuse.is_valid_flag,
 										parent_use=parent_use)
+									# It's possible for autounmask to change
+									# parent_use such that the unevaluated form
+									# of the atom now matches, even though the
+									# earlier evaluated form (from before
+									# autounmask changed parent_use) does not.
+									# In this case (see bug #374423), it's
+									# expected that violated_atom.use is None.
+									# Since the atom now matches, we don't want
+									# to display it in the slot conflict
+									# message, so we simply ignore it and rely
+									# on the autounmask display to communicate
+									# the necessary USE change to the user.
+									if violated_atom.use is None:
+										continue
 									if use in violated_atom.use.enabled or \
 										use in violated_atom.use.disabled:
 										unconditional_use_deps.add((ppkg, atom))