From bb85dfca12bec291d8a982aca48ea144469ff1cc Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 30 Mar 2008 02:13:19 +0000 Subject: For bugs #197810 and #215308, pass the depgraph's "selective" parameter down into dep_check() for better atom preference selection when handling virtuals and other disjunctive || dependencies. (branches/2.1.2 r9610) svn path=/main/trunk/; revision=9611 --- pym/_emerge/__init__.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pym/_emerge') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index d03a2eacb..328b7f1e9 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -2484,12 +2484,14 @@ class depgraph(object): myuse=myuse, strict=strict) if True: try: + self.trees[root]["selective"] = "selective" in self.myparams if not strict: portage.dep._dep_check_strict = False mycheck = portage.dep_check(depstring, None, pkgsettings, myuse=myuse, myroot=root, trees=trees) finally: + self.trees[root]["selective"] = False portage.dep._dep_check_strict = True if not mycheck[0]: raise portage.exception.InvalidDependString(mycheck[1]) -- cgit v1.2.3-1-g7c22