From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 9 Mar 2010 21:25:25 +0000 (-0000)
Subject: Disable implicit libc deps for ROOT != "/" since it's probably not needed.
X-Git-Tag: v2.1.8.3~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b71e518d42a3f35cfa1c4776074ad375bccb9d8d;p=portage.git

Disable implicit libc deps for ROOT != "/" since it's probably not needed.
(trunk r15809)

svn path=/main/branches/2.1.7/; revision=15811
---

diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index bde47f3a9..a6da7fee1 100644
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -425,6 +425,7 @@ class Scheduler(PollScheduler):
 		list contains both a new-style virtual and an old-style PROVIDE
 		virtual, the new-style virtual is used.
 		"""
+		implicit_libc_roots = set([self._running_root.root])
 		libc_set = InternalPackageSet([LIBC_PACKAGE_ATOM])
 		norm_libc_pkgs = {}
 		virt_libc_pkgs = {}
@@ -434,7 +435,8 @@ class Scheduler(PollScheduler):
 				continue
 			if pkg.installed:
 				continue
-			if pkg.operation == 'merge':
+			if pkg.root in implicit_libc_roots and \
+				pkg.operation == 'merge':
 				if libc_set.findAtomForPackage(pkg):
 					if pkg.category == 'virtual':
 						d = virt_libc_pkgs
@@ -458,7 +460,8 @@ class Scheduler(PollScheduler):
 				continue
 			if pkg.installed:
 				continue
-			if pkg.operation == 'merge':
+			if pkg.root in implicit_libc_roots and \
+				pkg.operation == 'merge':
 				if pkg in libc_pkgs:
 					earlier_libc_pkgs.add(pkg)
 				else:
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 07f79e2ca..9963c2fe0 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -3363,7 +3363,7 @@ class depgraph(object):
 
 		# Merge libc asap, in order to account for implicit
 		# dependencies. See bug #303567.
-		for root in self._dynamic_config.mydbapi:
+		for root in (running_root,):
 			libc_pkg = self._dynamic_config.mydbapi[root].match_pkgs(
 				portage.const.LIBC_PACKAGE_ATOM)
 			if libc_pkg: