From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 2 Mar 2010 20:22:00 +0000 (-0000)
Subject: Bug #303567 - Merge libc asap, in order to account for implicit dependencies.
X-Git-Tag: v2.1.8~133
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b06b624a5f0f41abdf8606c4b7f8588b3cdeb44a;p=portage.git

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 94fa06678..db8ddef63 100644
--- 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 d1d0b217d..4de35da4f 100644
--- 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",