diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-10-13 14:27:03 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-10-13 14:27:03 -0700 |
| commit | 5c7bf4eb09f644813a6f017ffd91665664142560 (patch) | |
| tree | 25d71f9506171f3c62f63e820e318b7a4d134722 /pym/portage/dbapi/porttree.py | |
| parent | a27f3f3058fdbdaca2bcb838aca02ffc4e32007a (diff) | |
| download | portage-5c7bf4eb09f644813a6f017ffd91665664142560.tar.gz portage-5c7bf4eb09f644813a6f017ffd91665664142560.tar.bz2 portage-5c7bf4eb09f644813a6f017ffd91665664142560.zip | |
layout.conf: revert authoritative-cache support
Those who wanted it have decided to use a different approach.
Diffstat (limited to 'pym/portage/dbapi/porttree.py')
| -rw-r--r-- | pym/portage/dbapi/porttree.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index 911dbb5fe..ef2e08870 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -218,7 +218,6 @@ class portdbapi(dbapi): conf = self.repositories.get_repo_for_location(x) cache = self._pregen_auxdb[x] = self.metadbmodule( x, "metadata/cache", filtered_auxdbkeys, readonly=True) - cache.is_authoritative = conf.cache_is_authoritative try: cache.ec = self._repo_info[x].eclass_db except AttributeError: @@ -443,11 +442,10 @@ class portdbapi(dbapi): eapi = metadata.get('EAPI', '').strip() if not eapi: eapi = '0' - if not (eapi[:1] == '-' and eapi_is_supported(eapi[1:])): - if auxdb.is_authoritative or ( \ - emtime == metadata['_mtime_'] and \ - eclass_db.is_eclass_data_valid(metadata['_eclasses_'])): - doregen = False + if not (eapi[:1] == '-' and eapi_is_supported(eapi[1:])) and \ + emtime == metadata['_mtime_'] and \ + eclass_db.is_eclass_data_valid(metadata['_eclasses_']): + doregen = False if not doregen: break |