diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:18:09 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-03-11 06:18:09 +0000 |
| commit | 80c28c5ae428176fd4f5c6fb019c83f1b21199d2 (patch) | |
| tree | 2d65e67d16cc23f9407325a47272e11e8eb1863f | |
| parent | bf43291a51dd432a831563d50c17ea38c3346180 (diff) | |
| download | portage-80c28c5ae428176fd4f5c6fb019c83f1b21199d2.tar.gz portage-80c28c5ae428176fd4f5c6fb019c83f1b21199d2.tar.bz2 portage-80c28c5ae428176fd4f5c6fb019c83f1b21199d2.zip | |
In mirror_cache(), normalize EAPI by mapping EAPI=0 to empty. (trunk r12706)
svn path=/main/branches/2.1.6/; revision=12961
| -rw-r--r-- | pym/portage/cache/util.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pym/portage/cache/util.py b/pym/portage/cache/util.py index 7d81f2d05..86f93440e 100644 --- a/pym/portage/cache/util.py +++ b/pym/portage/cache/util.py @@ -53,13 +53,14 @@ def mirror_cache(valid_nodes_iterable, src_cache, trg_cache, eclass_cache=None, except cache_errors.CacheError: pass + for d in (entry, trg): + if d is not None and d.get('EAPI') in ('', '0'): + del d['EAPI'] + if trg and not write_it: """ We don't want to skip the write unless we're really sure that the existing cache is identical, so don't trust _mtime_ and _eclasses_ alone.""" - for d in (entry, trg): - if "EAPI" in d and d["EAPI"] in ("", "0"): - del d["EAPI"] for k in set(chain(entry, trg)).difference( ("_mtime_", "_eclasses_")): if trg.get(k, "") != entry.get(k, ""): |