Merge libc asap for all roots instead of just ROOT="/". (trunk r15804)

svn path=/main/branches/2.1.7/; revision=15808

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index d382e22fc0a33228914036dcae5ac89867e5be96..07f79e2ca250417bb3fa11cef0e653c1fc80639d 100644 (file)
--- 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):