| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-30 06:50:34 +0000 (Thu, 30 Apr 2009) |
| 3 |
New Revision: 13437 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
In MetadataRegen._metadata_exit(), notify the consumer of failures (in this |
| 9 |
case the metadata argument is None). (trunk r13258) |
| 10 |
|
| 11 |
Modified: main/branches/2.1.6/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 06:50:18 UTC (rev 13436) |
| 14 |
+++ main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 06:50:34 UTC (rev 13437) |
| 15 |
@@ -11696,18 +11696,21 @@ |
| 16 |
|
| 17 |
def _metadata_exit(self, metadata_process): |
| 18 |
self._jobs -= 1 |
| 19 |
- if metadata_process.returncode == os.EX_OK: |
| 20 |
- if self._consumer is not None: |
| 21 |
- self._consumer(metadata_process.cpv, |
| 22 |
- metadata_process.ebuild_path, |
| 23 |
- metadata_process.repo_path, |
| 24 |
- metadata_process.metadata) |
| 25 |
- else: |
| 26 |
+ if metadata_process.returncode != os.EX_OK: |
| 27 |
self.returncode = 1 |
| 28 |
self._error_count += 1 |
| 29 |
self._valid_pkgs.discard(metadata_process.cpv) |
| 30 |
portage.writemsg("Error processing %s, continuing...\n" % \ |
| 31 |
(metadata_process.cpv,)) |
| 32 |
+ |
| 33 |
+ if self._consumer is not None: |
| 34 |
+ # On failure, still notify the consumer (in this case the metadata |
| 35 |
+ # argument is None). |
| 36 |
+ self._consumer(metadata_process.cpv, |
| 37 |
+ metadata_process.ebuild_path, |
| 38 |
+ metadata_process.repo_path, |
| 39 |
+ metadata_process.metadata) |
| 40 |
+ |
| 41 |
self._schedule() |
| 42 |
|
| 43 |
class UninstallFailure(portage.exception.PortageException): |
Archives