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 bde47f3a96f69951d736471e9c4b20b6c1f758c8..a6da7fee16fb386c6c5db7994619818e4c690332 100644 (file)
--- 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 07f79e2ca250417bb3fa11cef0e653c1fc80639d..9963c2fe07a65819972e97487ee5f30d72547651 100644 (file)
--- 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: