| 1 |
commit: 0472c8083ea647de8973504f60563aa08e4ef576 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 21 23:16:13 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 21 23:16:13 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=0472c808 |
| 7 |
|
| 8 |
vardbapi._aux_get: account for _aux_cache_keys_re |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/dbapi/vartree.py | 3 ++- |
| 12 |
1 files changed, 2 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py |
| 15 |
index 6f8ee5f..7184550 100644 |
| 16 |
--- a/pym/portage/dbapi/vartree.py |
| 17 |
+++ b/pym/portage/dbapi/vartree.py |
| 18 |
@@ -720,7 +720,8 @@ class vardbapi(dbapi): |
| 19 |
myf.close() |
| 20 |
except IOError: |
| 21 |
myd = None |
| 22 |
- if x not in self._aux_cache_keys: |
| 23 |
+ if x not in self._aux_cache_keys and \ |
| 24 |
+ self._aux_cache_keys_re.match(x) is None: |
| 25 |
myd = self._aux_env_search(mycpv, x) |
| 26 |
if myd is None: |
| 27 |
myd = _unicode_decode('') |
Archives