1 |
Author: zmedico |
2 |
Date: 2008-05-26 23:16:13 +0000 (Mon, 26 May 2008) |
3 |
New Revision: 10433 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
main/trunk/pym/portage/__init__.py |
8 |
Log: |
9 |
Don't silently swallow instances of UnpicklingError since they are easily |
10 |
triggered by storing instances of custom classes in a pickle. |
11 |
|
12 |
|
13 |
Modified: main/trunk/pym/_emerge/__init__.py |
14 |
=================================================================== |
15 |
--- main/trunk/pym/_emerge/__init__.py 2008-05-26 23:05:46 UTC (rev 10432) |
16 |
+++ main/trunk/pym/_emerge/__init__.py 2008-05-26 23:16:13 UTC (rev 10433) |
17 |
@@ -1423,8 +1423,12 @@ |
18 |
self._cache_data = mypickle.load() |
19 |
f.close() |
20 |
del f |
21 |
- except (IOError, OSError, EOFError, cPickle.UnpicklingError): |
22 |
- pass |
23 |
+ except (IOError, OSError, EOFError, cPickle.UnpicklingError), e: |
24 |
+ if isinstance(e, cPickle.UnpicklingError): |
25 |
+ writemsg("!!! Error loading '%s': %s\n" % \ |
26 |
+ (self._cache_filename, str(e)), noiselevel=-1) |
27 |
+ del e |
28 |
+ |
29 |
cache_valid = self._cache_data and \ |
30 |
isinstance(self._cache_data, dict) and \ |
31 |
self._cache_data.get("version") == self._cache_version and \ |
32 |
|
33 |
Modified: main/trunk/pym/portage/__init__.py |
34 |
=================================================================== |
35 |
--- main/trunk/pym/portage/__init__.py 2008-05-26 23:05:46 UTC (rev 10432) |
36 |
+++ main/trunk/pym/portage/__init__.py 2008-05-26 23:16:13 UTC (rev 10433) |
37 |
@@ -6550,7 +6550,11 @@ |
38 |
d = mypickle.load() |
39 |
f.close() |
40 |
del f |
41 |
- except (IOError, OSError, EOFError, cPickle.UnpicklingError): |
42 |
+ except (IOError, OSError, EOFError, cPickle.UnpicklingError), e: |
43 |
+ if isinstance(e, cPickle.UnpicklingError): |
44 |
+ writemsg("!!! Error loading '%s': %s\n" % \ |
45 |
+ (filename, str(e)), noiselevel=-1) |
46 |
+ del e |
47 |
d = {} |
48 |
|
49 |
if "old" in d: |
50 |
|
51 |
-- |
52 |
gentoo-commits@l.g.o mailing list |