public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] portage r15362 - in main/trunk/pym: _emerge portage
@ 2010-02-17  3:50 Zac Medico (zmedico)
  0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2010-02-17  3:50 UTC (permalink / raw
  To: gentoo-commits

Author: zmedico
Date: 2010-02-17 03:50:39 +0000 (Wed, 17 Feb 2010)
New Revision: 15362

Modified:
   main/trunk/pym/_emerge/depgraph.py
   main/trunk/pym/portage/const.py
Log:
Bug #303567 - Merge libc asap, in order to account for implicit dependencies.


Modified: main/trunk/pym/_emerge/depgraph.py
===================================================================
--- main/trunk/pym/_emerge/depgraph.py	2010-02-16 22:13:32 UTC (rev 15361)
+++ main/trunk/pym/_emerge/depgraph.py	2010-02-17 03:50:39 UTC (rev 15362)
@@ -3335,6 +3335,15 @@
 				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):
 			"""

Modified: main/trunk/pym/portage/const.py
===================================================================
--- main/trunk/pym/portage/const.py	2010-02-16 22:13:32 UTC (rev 15361)
+++ main/trunk/pym/portage/const.py	2010-02-17 03:50:39 UTC (rev 15362)
@@ -71,6 +71,7 @@
 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",




^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2010-02-17  3:50 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-17  3:50 [gentoo-commits] portage r15362 - in main/trunk/pym: _emerge portage Zac Medico (zmedico)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox