diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-04-30 07:03:46 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-04-30 07:03:46 +0000 |
| commit | 59554726ed9b281c1926a257bc98d420c1952eb9 (patch) | |
| tree | 06e5be534e06c4d119f34447494c323fe9b4ef07 /pym/_emerge/__init__.py | |
| parent | Use _doebuild_exit_status_check() for unsuccessful return codes (no just (diff) | |
| download | portage-multirepo-59554726ed9b281c1926a257bc98d420c1952eb9.tar.gz portage-multirepo-59554726ed9b281c1926a257bc98d420c1952eb9.tar.bz2 portage-multirepo-59554726ed9b281c1926a257bc98d420c1952eb9.zip | |
Bug #265034 - In depgraph.loadResumeCommand(), tolerate missing packages
since it's possible that the resume list is still partially valid.
(trunk r13312)
svn path=/main/branches/2.1.6/; revision=13483
Diffstat (limited to 'pym/_emerge/__init__.py')
| -rw-r--r-- | pym/_emerge/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 2550577c..98cf1811 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -8743,7 +8743,8 @@ class depgraph(object): if world_locked: world_set.unlock() - def loadResumeCommand(self, resume_data, skip_masked=False): + def loadResumeCommand(self, resume_data, skip_masked=True, + skip_missing=True): """ Add a resume command to the graph and validate it in the process. This will raise a PackageNotFound exception if a package is not available. @@ -8778,7 +8779,8 @@ class depgraph(object): # It does no exist or it is corrupt. if action == "uninstall": continue - raise portage.exception.PackageNotFound(pkg_key) + if not skip_missing: + raise portage.exception.PackageNotFound(pkg_key) installed = action == "uninstall" built = pkg_type != "ebuild" root_config = self.roots[myroot] |