From 13538539f7818ec6fc77e68fd20c41017caf946b Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 30 Mar 2008 00:55:46 +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.

svn path=/main/branches/2.1.2/; revision=9610
---
 bin/emerge | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'bin')

diff --git a/bin/emerge b/bin/emerge
index b3a8d25f3..7c79c922a 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2424,6 +2424,7 @@ class depgraph:
 				mymerge = []
 		else:
 			try:
+				self.trees[myroot]["selective"] = "selective" in self.myparams
 				if myparent and p_status == "nomerge":
 					portage_dep._dep_check_strict = False
 				mycheck = portage.dep_check(depstring, None,
@@ -2431,6 +2432,7 @@ class depgraph:
 					use_binaries=("--usepkgonly" in self.myopts),
 					myroot=myroot, trees=self.trees)
 			finally:
+				self.trees[myroot]["selective"] = False
 				portage_dep._dep_check_strict = True
 
 			if not mycheck[0]:
-- 
cgit v1.2.3-1-g7c22