From d4ea29bf6a3ce35d49e0f54f9173e3a6e42da2d6 Mon Sep 17 00:00:00 2001 From: Brian Harring Date: Thu, 13 Oct 2011 16:26:03 -0700 Subject: 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). --- pym/_emerge/actions.py | 8 -------- 1 file changed, 8 deletions(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 08f70df05..70a92c972 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -1660,14 +1660,6 @@ def action_metadata(settings, portdb, myopts, porttrees=None): porttrees_data = [] for path in porttrees: src_db = portdb._pregen_auxdb.get(path) - if src_db is None and \ - os.path.isdir(os.path.join(path, 'metadata', 'cache')): - src_db = portdb.metadbmodule( - path, 'metadata/cache', auxdbkeys, readonly=True) - try: - src_db.ec = portdb._repo_info[path].eclass_db - except AttributeError: - pass if src_db is not None: porttrees_data.append(TreeData(portdb.auxdb[path], -- cgit v1.2.3-1-g7c22