| 1 |
Author: zmedico |
| 2 |
Date: 2009-02-25 07:50:34 +0000 (Wed, 25 Feb 2009) |
| 3 |
New Revision: 12706 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/cache/util.py |
| 7 |
Log: |
| 8 |
In mirror_cache(), normalize EAPI by mapping EAPI=0 to empty. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/portage/cache/util.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/portage/cache/util.py 2009-02-24 23:16:42 UTC (rev 12705) |
| 14 |
+++ main/trunk/pym/portage/cache/util.py 2009-02-25 07:50:34 UTC (rev 12706) |
| 15 |
@@ -53,13 +53,14 @@ |
| 16 |
except cache_errors.CacheError: |
| 17 |
pass |
| 18 |
|
| 19 |
+ for d in (entry, trg): |
| 20 |
+ if d is not None and d.get('EAPI') in ('', '0'): |
| 21 |
+ del d['EAPI'] |
| 22 |
+ |
| 23 |
if trg and not write_it: |
| 24 |
""" We don't want to skip the write unless we're really sure that |
| 25 |
the existing cache is identical, so don't trust _mtime_ and |
| 26 |
_eclasses_ alone.""" |
| 27 |
- for d in (entry, trg): |
| 28 |
- if "EAPI" in d and d["EAPI"] in ("", "0"): |
| 29 |
- del d["EAPI"] |
| 30 |
for k in set(chain(entry, trg)).difference( |
| 31 |
("_mtime_", "_eclasses_")): |
| 32 |
if trg.get(k, "") != entry.get(k, ""): |
Archives