diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-08-27 08:57:43 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-27 08:57:43 -0700 |
| commit | 6a8f74769f9faeb2a768f345e1aa6d14a48976a5 (patch) | |
| tree | 1bf32e025cc9ddd8a2b973d9ef89af760d11a1bf /pym | |
| parent | 550ff15440fc85cc80d1adf1f70f3caacb2fd8e5 (diff) | |
| download | portage-6a8f74769f9faeb2a768f345e1aa6d14a48976a5.tar.gz portage-6a8f74769f9faeb2a768f345e1aa6d14a48976a5.tar.bz2 portage-6a8f74769f9faeb2a768f345e1aa6d14a48976a5.zip | |
fix ppkg type handling in slot_conflict_handler
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/resolver/slot_collision.py | 5 |
1 files changed, 3 insertions, 2 deletions
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), \ |