diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 03:22:52 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 03:22:52 +0000 |
| commit | 7571c15586b03fc5761a28bdce0b5f90e0e4c3d6 (patch) | |
| tree | d58ed3436da819aa8b9e125e6c5e344a2a600fd8 /pym | |
| parent | 4967f78b6e3e541d7c2b7a4dde9376a73a90007c (diff) | |
| download | portage-7571c15586b03fc5761a28bdce0b5f90e0e4c3d6.tar.gz portage-7571c15586b03fc5761a28bdce0b5f90e0e4c3d6.tar.bz2 portage-7571c15586b03fc5761a28bdce0b5f90e0e4c3d6.zip | |
Inside depgraph.loadResumeCommand(), when appropriate, complete the graph
before analyzing any unsatisfied deps that may exist. (trunk r12547)
svn path=/main/branches/2.1.6/; revision=12833
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/__init__.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index ab035b461..2b764fad6 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -8500,8 +8500,14 @@ class depgraph(object): if not self._create_graph(allow_unsatisfied=True): return False + # When appropriate, complete the graph before analyzing + # any unsatisfied deps that may exist. + if not self._complete_graph(): + return False + unsatisfied_deps = [] - for dep in self._unsatisfied_deps: + for dep in self._unsatisfied_deps + \ + self._initially_unsatisfied_deps: if not isinstance(dep.parent, Package): continue if dep.parent.operation == "merge": |