diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-04-14 01:23:45 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-04-14 01:23:45 +0000 |
| commit | 5a65a33ccd7b201fa75e654c3123fc84a49f7e5d (patch) | |
| tree | 40288d638dd52a85e2db22dff97aa570acc5bbb8 | |
| parent | 4a50e9a2babf0a64cef1eed78d0f0a40cf977172 (diff) | |
| download | portage-5a65a33ccd7b201fa75e654c3123fc84a49f7e5d.tar.gz portage-5a65a33ccd7b201fa75e654c3123fc84a49f7e5d.tar.bz2 portage-5a65a33ccd7b201fa75e654c3123fc84a49f7e5d.zip | |
Fix some breakage in the allow_unsatisfied handling.
svn path=/main/trunk/; revision=9886
| -rw-r--r-- | pym/_emerge/__init__.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 54d263010..dad9b080a 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -1780,7 +1780,8 @@ class depgraph(object): 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): @@ -1997,7 +1998,7 @@ class depgraph(object): 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 @@ -2071,9 +2072,11 @@ class depgraph(object): mypriority = dep_priority.copy() if not blocker and vardb.match(atom): mypriority.satisfied = True - self._add_dep(Dependency(atom=atom, + if not self._add_dep(Dependency(atom=atom, blocker=blocker, depth=depth, parent=pkg, - priority=mypriority, root=dep_root)) + priority=mypriority, root=dep_root), + allow_unsatisfied=allow_unsatisfied): + return 0 if debug: print "Exiting...", jbigkey except ValueError, e: |