diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-04-10 19:22:01 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-04-10 19:22:01 +0000 |
| commit | 4083385a6ac8882e408eff532e18eec2444822fa (patch) | |
| tree | 7412105807af24d60d3570fb9593f415a2d9ace0 | |
| parent | 3d819dc230439c4bde66d6689744fee6205fb291 (diff) | |
| download | portage-4083385a6ac8882e408eff532e18eec2444822fa.tar.gz portage-4083385a6ac8882e408eff532e18eec2444822fa.tar.bz2 portage-4083385a6ac8882e408eff532e18eec2444822fa.zip | |
Bug #265034 - In depgraph.loadResumeCommand(), tolerate missing packages
since it's possible that the resume list is still partially valid.
svn path=/main/trunk/; revision=13312
| -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 0802e6143..74638e198 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -8759,7 +8759,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. @@ -8794,7 +8795,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] |