Bug #303567 - Merge libc asap, in order to account for implicit dependencies.

(trunk r15362)

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

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 94fa0667899f9462b117b24576753ebe5b71c4d9..db8ddef63c86276d35c9aabee69f6714871b1f09 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -3335,6 +3335,15 @@ class depgraph(object):
                                runtime_deps.update(atom for atom in atoms \
                                        if not atom.blocker)
 
+               # 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)
+
                def gather_deps(ignore_priority, mergeable_nodes,
                        selected_nodes, node):
                        """

diff --git a/pym/portage/const.py b/pym/portage/const.py
index d1d0b217df699f94c44022f852e56bd463f5a14a..4de35da4ff53be1c477110c94533b16b083a7595 100644 (file)
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -70,6 +70,7 @@ REPO_NAME_FILE           = "repo_name"
 REPO_NAME_LOC            = "profiles" + "/" + REPO_NAME_FILE
 
 PORTAGE_PACKAGE_ATOM     = "sys-apps/portage"
+LIBC_PACKAGE_ATOM        = "virtual/libc"
 
 INCREMENTALS             = ("USE", "USE_EXPAND", "USE_EXPAND_HIDDEN",
                            "FEATURES", "ACCEPT_KEYWORDS",