From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 9 Mar 2010 20:10:57 +0000 (-0000)
Subject: Merge libc asap for all roots instead of just ROOT="/".
X-Git-Tag: v2.2_rc67~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2ffbd895023cb0316c826e5ed85a13f37555e6ab;p=portage.git

Merge libc asap for all roots instead of just ROOT="/".

svn path=/main/trunk/; revision=15804
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 0e17e8c20..e34d6d021 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -3363,12 +3363,13 @@ class depgraph(object):
 
 		# Merge libc asap, in order to account for implicit
 		# dependencies. See bug #303567.
-		libc_pkg = self._dynamic_config.mydbapi[running_root].match_pkgs(
-			portage.const.LIBC_PACKAGE_ATOM)
-		if libc_pkg:
-			libc_pkg = libc_pkg[0]
-			if libc_pkg.operation == 'merge':
-				asap_nodes.append(libc_pkg)
+		for root in self._dynamic_config.mydbapi:
+			libc_pkg = self._dynamic_config.mydbapi[root].match_pkgs(
+				portage.const.LIBC_PACKAGE_ATOM)
+			if libc_pkg:
+				libc_pkg = libc_pkg[0]
+				if libc_pkg.operation == 'merge':
+					asap_nodes.append(libc_pkg)
 
 		def gather_deps(ignore_priority, mergeable_nodes,
 			selected_nodes, node):