1 |
Author: zmedico |
2 |
Date: 2009-03-31 07:12:00 +0000 (Tue, 31 Mar 2009) |
3 |
New Revision: 13258 |
4 |
|
5 |
Modified: |
6 |
main/trunk/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). |
10 |
|
11 |
|
12 |
Modified: main/trunk/pym/_emerge/__init__.py |
13 |
=================================================================== |
14 |
--- main/trunk/pym/_emerge/__init__.py 2009-03-31 06:16:26 UTC (rev 13257) |
15 |
+++ main/trunk/pym/_emerge/__init__.py 2009-03-31 07:12:00 UTC (rev 13258) |
16 |
@@ -11712,18 +11712,21 @@ |
17 |
|
18 |
def _metadata_exit(self, metadata_process): |
19 |
self._jobs -= 1 |
20 |
- if metadata_process.returncode == os.EX_OK: |
21 |
- if self._consumer is not None: |
22 |
- self._consumer(metadata_process.cpv, |
23 |
- metadata_process.ebuild_path, |
24 |
- metadata_process.repo_path, |
25 |
- metadata_process.metadata) |
26 |
- else: |
27 |
+ if metadata_process.returncode != os.EX_OK: |
28 |
self.returncode = 1 |
29 |
self._error_count += 1 |
30 |
self._valid_pkgs.discard(metadata_process.cpv) |
31 |
portage.writemsg("Error processing %s, continuing...\n" % \ |
32 |
(metadata_process.cpv,)) |
33 |
+ |
34 |
+ if self._consumer is not None: |
35 |
+ # On failure, still notify the consumer (in this case the metadata |
36 |
+ # argument is None). |
37 |
+ self._consumer(metadata_process.cpv, |
38 |
+ metadata_process.ebuild_path, |
39 |
+ metadata_process.repo_path, |
40 |
+ metadata_process.metadata) |
41 |
+ |
42 |
self._schedule() |
43 |
|
44 |
class UninstallFailure(portage.exception.PortageException): |