summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-26 08:42:28 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-26 08:42:28 -0700
commit19a9f8718f8bde631e086a8ebc984566d1e93513 (patch)
tree36fc0c07ff38c7a2f0875e6e7a0b394d5daec186
parent66e3bf759c35234527fb2b665be7de1e46d4625c (diff)
downloadportage-19a9f8718f8bde631e086a8ebc984566d1e93513.tar.gz
portage-19a9f8718f8bde631e086a8ebc984566d1e93513.tar.bz2
portage-19a9f8718f8bde631e086a8ebc984566d1e93513.zip
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.
-rw-r--r--pym/_emerge/resolver/slot_collision.py6
1 files changed, 1 insertions, 5 deletions
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))