From 6a8f74769f9faeb2a768f345e1aa6d14a48976a5 Mon Sep 17 00:00:00 2001 From: Sebastian Luther Date: Fri, 27 Aug 2010 08:57:43 -0700 Subject: fix ppkg type handling in slot_conflict_handler --- pym/_emerge/resolver/slot_collision.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'pym/_emerge/resolver') diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py index c37c1089b..9c3d13795 100644 --- a/pym/_emerge/resolver/slot_collision.py +++ b/pym/_emerge/resolver/slot_collision.py @@ -458,12 +458,13 @@ class slot_conflict_handler(object): if not pkg.iuse.is_valid_flag(atom.unevaluated_atom.use.required): #Missing IUSE. + #FIXME: This needs to support use dep defaults. if self.debug: - writemsg(str(pkg) + " misses need flags from IUSE." + \ + writemsg(str(pkg) + " misses needed flags from IUSE." + \ " Rejecting configuration.\n", noiselevel=-1) return False - if ppkg.installed: + if not isinstance(ppkg, Package) or ppkg.installed: #We cannot assume that it's possible to reinstall the package. Do not #check if some of its atom has use.conditional violated_atom = atom.violated_conditionals(_pkg_use_enabled(pkg), \ -- cgit v1.2.3-1-g7c22