1 |
Author: zmedico |
2 |
Date: 2008-04-14 01:23:45 +0000 (Mon, 14 Apr 2008) |
3 |
New Revision: 9886 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
Log: |
8 |
Fix some breakage in the allow_unsatisfied handling. |
9 |
|
10 |
|
11 |
Modified: main/trunk/pym/_emerge/__init__.py |
12 |
=================================================================== |
13 |
--- main/trunk/pym/_emerge/__init__.py 2008-04-14 01:12:03 UTC (rev 9885) |
14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-04-14 01:23:45 UTC (rev 9886) |
15 |
@@ -1780,7 +1780,8 @@ |
16 |
while dep_stack: |
17 |
dep = dep_stack.pop() |
18 |
if isinstance(dep, Package): |
19 |
- if not self._add_pkg_deps(dep): |
20 |
+ if not self._add_pkg_deps(dep, |
21 |
+ allow_unsatisfied=allow_unsatisfied): |
22 |
return 0 |
23 |
continue |
24 |
if not self._add_dep(dep, allow_unsatisfied=allow_unsatisfied): |
25 |
@@ -1997,7 +1998,7 @@ |
26 |
dep_stack.append(pkg) |
27 |
return 1 |
28 |
|
29 |
- def _add_pkg_deps(self, pkg): |
30 |
+ def _add_pkg_deps(self, pkg, allow_unsatisfied=False): |
31 |
|
32 |
mytype = pkg.type_name |
33 |
myroot = pkg.root |
34 |
@@ -2071,9 +2072,11 @@ |
35 |
mypriority = dep_priority.copy() |
36 |
if not blocker and vardb.match(atom): |
37 |
mypriority.satisfied = True |
38 |
- self._add_dep(Dependency(atom=atom, |
39 |
+ if not self._add_dep(Dependency(atom=atom, |
40 |
blocker=blocker, depth=depth, parent=pkg, |
41 |
- priority=mypriority, root=dep_root)) |
42 |
+ priority=mypriority, root=dep_root), |
43 |
+ allow_unsatisfied=allow_unsatisfied): |
44 |
+ return 0 |
45 |
if debug: |
46 |
print "Exiting...", jbigkey |
47 |
except ValueError, e: |
48 |
|
49 |
-- |
50 |
gentoo-commits@l.g.o mailing list |