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 r9889 - main/branches/2.1.2/bin
Date: Mon, 14 Apr 2008 01:35:27 +0000
Author: zmedico
Date: 2008-04-14 01:35:25 +0000 (Mon, 14 Apr 2008)
New Revision: 9889

Modified:
   main/branches/2.1.2/bin/emerge
Log:
* Call depgraph._add_dep() to add package dependencies to the graph
  as soon as possible rather than pushing them onto the stack. (trunk r9885)

* Fix some breakage in the allow_unsatisfied handling. (trunk r9886)


Modified: main/branches/2.1.2/bin/emerge
===================================================================
--- main/branches/2.1.2/bin/emerge	2008-04-14 01:32:24 UTC (rev 9888)
+++ main/branches/2.1.2/bin/emerge	2008-04-14 01:35:25 UTC (rev 9889)
@@ -1919,7 +1919,8 @@
 		while dep_stack:
 			dep = dep_stack.pop()
 			if isinstance(dep, Package):
-				if not self._add_pkg_deps(dep):
+				if not self._add_pkg_deps(dep,
+					allow_unsatisfied=allow_unsatisfied):
 					return 0
 				continue
 			if not self._add_dep(dep, allow_unsatisfied=allow_unsatisfied):
@@ -2136,7 +2137,7 @@
 		dep_stack.append(pkg)
 		return 1
 
-	def _add_pkg_deps(self, pkg):
+	def _add_pkg_deps(self, pkg, allow_unsatisfied=False):
 
 		mytype = pkg.type_name
 		myroot = pkg.root
@@ -2210,10 +2211,11 @@
 					mypriority = dep_priority.copy()
 					if not blocker and vardb.match(atom):
 						mypriority.satisfied = True
-					self._dep_stack.append(
-						Dependency(atom=atom,
-							blocker=blocker, depth=depth, parent=pkg,
-							priority=mypriority, root=dep_root))
+					if not self._add_dep(Dependency(atom=atom,
+						blocker=blocker, depth=depth, parent=pkg,
+						priority=mypriority, root=dep_root),
+						allow_unsatisfied=allow_unsatisfied):
+						return 0
 				if debug:
 					print "Exiting...", jbigkey
 		except ValueError, e:

-- 
gentoo-commits@g.o mailing list


Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
portage r9888 - main/branches/2.1.2/bin
Next by thread:
gentoo-x86 commit in media-sound/alsa-driver: ChangeLog alsa-driver-1.0.16.ebuild
Previous by date:
portage r9888 - main/branches/2.1.2/bin
Next by date:
gentoo-x86 commit in profiles/desc: alsa_cards.desc


Updated Apr 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.