diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-03-09 20:10:57 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-03-09 20:10:57 +0000 |
| commit | 2ffbd895023cb0316c826e5ed85a13f37555e6ab (patch) | |
| tree | 8806ae193a9654a4ba036ff82c12b3f212548924 | |
| parent | 66a3125584471c73a885b50ac98cb4fc67df0d78 (diff) | |
| download | portage-2ffbd895023cb0316c826e5ed85a13f37555e6ab.tar.gz portage-2ffbd895023cb0316c826e5ed85a13f37555e6ab.tar.bz2 portage-2ffbd895023cb0316c826e5ed85a13f37555e6ab.zip | |
Merge libc asap for all roots instead of just ROOT="/".
svn path=/main/trunk/; revision=15804
| -rw-r--r-- | pym/_emerge/depgraph.py | 13 |
1 files changed, 7 insertions, 6 deletions
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): |