summaryrefslogtreecommitdiffstats
path: root/pym/portage/package/ebuild/config.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-12-22 12:06:45 -0800
committerZac Medico <zmedico@gentoo.org>2011-12-22 12:06:45 -0800
commit9ef18c2a97bee1ff94163b77573aea72d7a3b01b (patch)
treedb1d93ae05fe74733b0ec1eec87823067d5e67c5 /pym/portage/package/ebuild/config.py
parent08e4be7fa43c99b9acbfe30982d51ef6f881c000 (diff)
downloadportage-9ef18c2a97bee1ff94163b77573aea72d7a3b01b.tar.gz
portage-9ef18c2a97bee1ff94163b77573aea72d7a3b01b.tar.bz2
portage-9ef18c2a97bee1ff94163b77573aea72d7a3b01b.zip
config.setcpv(): use dbapi._aux_cache_keys
This helps to avoid triggering the environment.bz2 extraction in vardbapi.aux_get().
Diffstat (limited to 'pym/portage/package/ebuild/config.py')
-rw-r--r--pym/portage/package/ebuild/config.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index f6166c65b..366f548f1 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -1188,8 +1188,11 @@ class config(object):
# packages since we want to save it PORTAGE_BUILT_USE for
# evaluating conditional USE deps in atoms passed via IPC to
# helpers like has_version and best_version.
+ aux_keys = set(aux_keys)
+ if hasattr(mydb, '_aux_cache_keys'):
+ aux_keys = aux_keys.intersection(mydb._aux_cache_keys)
+ aux_keys.add('USE')
aux_keys = list(aux_keys)
- aux_keys.append('USE')
for k, v in zip(aux_keys, mydb.aux_get(self.mycpv, aux_keys)):
pkg_configdict[k] = v
built_use = frozenset(pkg_configdict.pop('USE').split())