| 1 |
Author: zmedico |
| 2 |
Date: 2008-04-14 01:35:25 +0000 (Mon, 14 Apr 2008) |
| 3 |
New Revision: 9889 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
* Call depgraph._add_dep() to add package dependencies to the graph |
| 9 |
as soon as possible rather than pushing them onto the stack. (trunk r9885) |
| 10 |
|
| 11 |
* Fix some breakage in the allow_unsatisfied handling. (trunk r9886) |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/branches/2.1.2/bin/emerge |
| 15 |
=================================================================== |
| 16 |
--- main/branches/2.1.2/bin/emerge 2008-04-14 01:32:24 UTC (rev 9888) |
| 17 |
+++ main/branches/2.1.2/bin/emerge 2008-04-14 01:35:25 UTC (rev 9889) |
| 18 |
@@ -1919,7 +1919,8 @@ |
| 19 |
while dep_stack: |
| 20 |
dep = dep_stack.pop() |
| 21 |
if isinstance(dep, Package): |
| 22 |
- if not self._add_pkg_deps(dep): |
| 23 |
+ if not self._add_pkg_deps(dep, |
| 24 |
+ allow_unsatisfied=allow_unsatisfied): |
| 25 |
return 0 |
| 26 |
continue |
| 27 |
if not self._add_dep(dep, allow_unsatisfied=allow_unsatisfied): |
| 28 |
@@ -2136,7 +2137,7 @@ |
| 29 |
dep_stack.append(pkg) |
| 30 |
return 1 |
| 31 |
|
| 32 |
- def _add_pkg_deps(self, pkg): |
| 33 |
+ def _add_pkg_deps(self, pkg, allow_unsatisfied=False): |
| 34 |
|
| 35 |
mytype = pkg.type_name |
| 36 |
myroot = pkg.root |
| 37 |
@@ -2210,10 +2211,11 @@ |
| 38 |
mypriority = dep_priority.copy() |
| 39 |
if not blocker and vardb.match(atom): |
| 40 |
mypriority.satisfied = True |
| 41 |
- self._dep_stack.append( |
| 42 |
- Dependency(atom=atom, |
| 43 |
- blocker=blocker, depth=depth, parent=pkg, |
| 44 |
- priority=mypriority, root=dep_root)) |
| 45 |
+ if not self._add_dep(Dependency(atom=atom, |
| 46 |
+ blocker=blocker, depth=depth, parent=pkg, |
| 47 |
+ priority=mypriority, root=dep_root), |
| 48 |
+ allow_unsatisfied=allow_unsatisfied): |
| 49 |
+ return 0 |
| 50 |
if debug: |
| 51 |
print "Exiting...", jbigkey |
| 52 |
except ValueError, e: |
| 53 |
|
| 54 |
-- |
| 55 |
gentoo-commits@l.g.o mailing list |
Archives