From 695fbb8f02db2239916e8fe435ed4d042c772cef Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 9 Mar 2010 20:21:28 +0000 Subject: [PATCH] Merge libc asap for all roots instead of just ROOT="/". (trunk r15804) svn path=/main/branches/2.1.7/; revision=15808 --- pym/_emerge/depgraph.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index d382e22fc..07f79e2ca 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): -- 2.26.2