Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 374423 | Differences between
and this patch

Collapse All | Expand All

(-)a/pym/_emerge/resolver/slot_collision.py (-1 / +9 lines)
Lines 588-593 class slot_conflict_handler(object): Link Here
588
				else:
588
				else:
589
					violated_atom = atom.unevaluated_atom.violated_conditionals(_pkg_use_enabled(pkg), \
589
					violated_atom = atom.unevaluated_atom.violated_conditionals(_pkg_use_enabled(pkg), \
590
						pkg.iuse.is_valid_flag, parent_use=_pkg_use_enabled(ppkg))
590
						pkg.iuse.is_valid_flag, parent_use=_pkg_use_enabled(ppkg))
591
					if violated_atom.use is None:
592
						# It's possible for autounmask to change
593
						# parent_use such that the unevaluated form
594
						# of the atom now matches, even though the
595
						# earlier evaluated form (from before
596
						# autounmask changed parent_use) does not.
597
						# In this case (see bug #374423), it's
598
						# expected that violated_atom.use is None.
599
						continue
591
600
592
				if pkg.installed and (violated_atom.use.enabled or violated_atom.use.disabled):
601
				if pkg.installed and (violated_atom.use.enabled or violated_atom.use.disabled):
593
					#We can't change USE of an installed package (only of an ebuild, but that is already
602
					#We can't change USE of an installed package (only of an ebuild, but that is already
594
- 

Return to bug 374423