From 19a9f8718f8bde631e086a8ebc984566d1e93513 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 26 Aug 2010 08:42:28 -0700 Subject: In slot_conflict_handler._prepare_conflict_msg_and_check_for_specificity() don't pass parent_use to Atom.violated_conditionals() since these atoms already have already been through use_reduce() with the parent's USE. --- pym/_emerge/resolver/slot_collision.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'pym') diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py index decbf9e3b..27cad3b99 100644 --- a/pym/_emerge/resolver/slot_collision.py +++ b/pym/_emerge/resolver/slot_collision.py @@ -1,7 +1,6 @@ from __future__ import print_function from _emerge.AtomArg import AtomArg -from _emerge.Package import Package from _emerge.PackageArg import PackageArg from portage.dep import check_required_use from portage.output import colorize @@ -217,11 +216,8 @@ class slot_conflict_handler(object): elif not atom_set.findAtomForPackage(other_pkg, \ modified_use=_pkg_use_enabled(other_pkg)): #Use conditionals not met. - parent_use = None - if isinstance(ppkg, Package): - parent_use = _pkg_use_enabled(ppkg) violated_atom = atom.violated_conditionals(_pkg_use_enabled(other_pkg), \ - other_pkg.iuse.is_valid_flag, parent_use=parent_use) + other_pkg.iuse.is_valid_flag) for flag in violated_atom.use.enabled.union(violated_atom.use.disabled): atoms = collision_reasons.get(("use", flag), set()) atoms.add((ppkg, atom, other_pkg)) -- cgit v1.2.3-1-g7c22