| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-30 07:03:46 +0000 (Thu, 30 Apr 2009) |
| 3 |
New Revision: 13483 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Bug #265034 - In depgraph.loadResumeCommand(), tolerate missing packages |
| 9 |
since it's possible that the resume list is still partially valid. |
| 10 |
(trunk r13312) |
| 11 |
|
| 12 |
Modified: main/branches/2.1.6/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 07:03:30 UTC (rev 13482) |
| 15 |
+++ main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 07:03:46 UTC (rev 13483) |
| 16 |
@@ -8743,7 +8743,8 @@ |
| 17 |
if world_locked: |
| 18 |
world_set.unlock() |
| 19 |
|
| 20 |
- def loadResumeCommand(self, resume_data, skip_masked=False): |
| 21 |
+ def loadResumeCommand(self, resume_data, skip_masked=True, |
| 22 |
+ skip_missing=True): |
| 23 |
""" |
| 24 |
Add a resume command to the graph and validate it in the process. This |
| 25 |
will raise a PackageNotFound exception if a package is not available. |
| 26 |
@@ -8778,7 +8779,8 @@ |
| 27 |
# It does no exist or it is corrupt. |
| 28 |
if action == "uninstall": |
| 29 |
continue |
| 30 |
- raise portage.exception.PackageNotFound(pkg_key) |
| 31 |
+ if not skip_missing: |
| 32 |
+ raise portage.exception.PackageNotFound(pkg_key) |
| 33 |
installed = action == "uninstall" |
| 34 |
built = pkg_type != "ebuild" |
| 35 |
root_config = self.roots[myroot] |
Archives