Gentoo Logo
Gentoo Spaceship




Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-commits
Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: gentoo-commits@g.o
From: "Zac Medico (zmedico)" <zmedico@g.o>
Subject: portage r9878 - main/branches/2.1.2/bin
Date: Sun, 13 Apr 2008 22:22:15 +0000
Author: zmedico
Date: 2008-04-13 22:22:14 +0000 (Sun, 13 Apr 2008)
New Revision: 9878

Modified:
   main/branches/2.1.2/bin/emerge
Log:
To optimize consistency of atom selections, add all of the root packages
to the graph before processing any dependencies. (trunk r9874)


Modified: main/branches/2.1.2/bin/emerge
===================================================================
--- main/branches/2.1.2/bin/emerge	2008-04-13 22:19:47 UTC (rev 9877)
+++ main/branches/2.1.2/bin/emerge	2008-04-13 22:22:14 UTC (rev 9878)
@@ -2535,6 +2535,7 @@
 		while args:
 			arg = args.pop()
 			for atom in arg.set:
+				self.spinner.update()
 				atom_cp = portage.dep_getkey(atom)
 				try:
 					pprovided = pprovideddict.get(portage.dep_getkey(atom))
@@ -2585,16 +2586,12 @@
 
 					dep = Dependency(atom=atom, onlydeps=onlydeps,
 						root=myroot, parent=arg)
-					self._dep_stack.append(dep)
 
 					# Add the selected package to the graph as soon as possible
 					# so that later dep_check() calls can use it as feedback
 					# for making more consistent atom selections.
 					if not self._add_pkg(pkg, dep.parent,
 						priority=dep.priority, depth=dep.depth):
-						return 0, myfavorites
-
-					if not self._create_graph():
 						if isinstance(arg, SetArg):
 							sys.stderr.write(("\n\n!!! Problem resolving " + \
 								"dependencies for %s from %s\n") % \
@@ -2603,6 +2600,7 @@
 							sys.stderr.write(("\n\n!!! Problem resolving " + \
 								"dependencies for %s\n") % atom)
 						return 0, myfavorites
+
 				except portage_exception.MissingSignature, e:
 					portage.writemsg("\n\n!!! A missing gpg signature is preventing portage from calculating the\n")
 					portage.writemsg("!!! required dependencies. This is a security feature enabled by the admin\n")
@@ -2624,6 +2622,11 @@
 					print >> sys.stderr, "!!!", str(e), getattr(e, "__module__", None)
 					raise
 
+		# Now that the root packages have been added to the graph,
+		# process the dependencies.
+		if not self._create_graph():
+			return 0, myfavorites
+
 		missing=0
 		if "--usepkgonly" in self.myopts:
 			for xs in self.digraph.all_nodes():

-- 
gentoo-commits@g.o mailing list


Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
gentoo-x86 commit in sys-apps/pciutils/files: pciutils-2.2.4-update-pciids.patch pciutils-2.2.4-link.patch pciutils-2.2.6-link.patch pcimodules-pciutils-2.2.0.patch pciutils-2.2.6-alloca.patch pcimodules-pciutils-2.2.4.patch pciutils-2.2.3-build.patch
Next by thread:
gentoo-x86 commit in media-sound/sweep: ChangeLog
Previous by date:
gentoo-x86 commit in sys-apps/pciutils/files: pciutils-2.2.4-update-pciids.patch pciutils-2.2.4-link.patch pciutils-2.2.6-link.patch pcimodules-pciutils-2.2.0.patch pciutils-2.2.6-alloca.patch pcimodules-pciutils-2.2.4.patch pciutils-2.2.3-build.patch
Next by date:
gentoo-x86 commit in media-sound/sweep: ChangeLog


Updated May 19, 2012

Summary: Archive of the gentoo-commits mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.