diff options
| author | Brian Harring <ferringb@chromium.org> | 2011-10-13 16:26:03 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-10-13 17:19:26 -0700 |
| commit | d4ea29bf6a3ce35d49e0f54f9173e3a6e42da2d6 (patch) | |
| tree | c7e1a577542f7441a5d7591df538b336402b0e90 /bin/egencache | |
| parent | bf28492ed8ccc7fd3679a8e5433101a0945d417d (diff) | |
| download | portage-d4ea29bf6a3ce35d49e0f54f9173e3a6e42da2d6.tar.gz portage-d4ea29bf6a3ce35d49e0f54f9173e3a6e42da2d6.tar.bz2 portage-d4ea29bf6a3ce35d49e0f54f9173e3a6e42da2d6.zip | |
layout.conf: make the pregenerated cache format controllable
Controllable via 'cache-format', currently it supports only one cache;
'pms', and defaults to it. If an unsupported cache-format is specified,
the cache is disabled. If pms is specified and metadata/cache directory
doesn't exist, the cache is disabled.
Finally, this rips out the best module support for locally overriding
the cache format used for pregenerated caches; this functionality made
zero sense (upstream determines the format, we use what is available).
Diffstat (limited to 'bin/egencache')
| -rwxr-xr-x | bin/egencache | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/egencache b/bin/egencache index 7766e786e..26660c1a9 100755 --- a/bin/egencache +++ b/bin/egencache @@ -38,6 +38,7 @@ except ImportError: from portage import os, _encodings, _unicode_encode, _unicode_decode from _emerge.MetadataRegen import MetadataRegen from portage.cache.cache_errors import CacheError, StatCollision +from portage.cache import metadata from portage.manifest import guessManifestFileType from portage.util import cmp_sort_key, writemsg_level from portage import cpv_getkey @@ -214,8 +215,7 @@ class GenCache(object): consumer=self._metadata_callback, max_jobs=max_jobs, max_load=max_load) self.returncode = os.EX_OK - metadbmodule = portdb.settings.load_best_module("portdbapi.metadbmodule") - self._trg_cache = metadbmodule(portdb.porttrees[0], + self._trg_cache = metadata.database(portdb.porttrees[0], "metadata/cache", portage.auxdbkeys[:]) if rsync: self._trg_cache.raise_stat_collision = True |