Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/
Date: Thu, 22 Dec 2011 20:07:14
Message-Id: 9ef18c2a97bee1ff94163b77573aea72d7a3b01b.zmedico@gentoo
1 commit: 9ef18c2a97bee1ff94163b77573aea72d7a3b01b
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 22 20:06:45 2011 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 22 20:06:45 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=9ef18c2a
7
8 config.setcpv(): use dbapi._aux_cache_keys
9
10 This helps to avoid triggering the environment.bz2 extraction in
11 vardbapi.aux_get().
12
13 ---
14 pym/portage/package/ebuild/config.py | 5 ++++-
15 1 files changed, 4 insertions(+), 1 deletions(-)
16
17 diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
18 index f6166c6..366f548 100644
19 --- a/pym/portage/package/ebuild/config.py
20 +++ b/pym/portage/package/ebuild/config.py
21 @@ -1188,8 +1188,11 @@ class config(object):
22 # packages since we want to save it PORTAGE_BUILT_USE for
23 # evaluating conditional USE deps in atoms passed via IPC to
24 # helpers like has_version and best_version.
25 + aux_keys = set(aux_keys)
26 + if hasattr(mydb, '_aux_cache_keys'):
27 + aux_keys = aux_keys.intersection(mydb._aux_cache_keys)
28 + aux_keys.add('USE')
29 aux_keys = list(aux_keys)
30 - aux_keys.append('USE')
31 for k, v in zip(aux_keys, mydb.aux_get(self.mycpv, aux_keys)):
32 pkg_configdict[k] = v
33 built_use = frozenset(pkg_configdict.pop('USE').split())