diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-02-25 07:50:34 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-02-25 07:50:34 +0000 |
| commit | cb030fde91a04fcc6178ee32ada425dafe0615d9 (patch) | |
| tree | 43469e8175dc8414aa091a7f71c219b0d18c76d7 | |
| parent | 356acce97b8ae68cf58e814da7ca06bad45fcd4a (diff) | |
| download | portage-cb030fde91a04fcc6178ee32ada425dafe0615d9.tar.gz portage-cb030fde91a04fcc6178ee32ada425dafe0615d9.tar.bz2 portage-cb030fde91a04fcc6178ee32ada425dafe0615d9.zip | |
In mirror_cache(), normalize EAPI by mapping EAPI=0 to empty.
svn path=/main/trunk/; revision=12706
| -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, ""): |