| 1 |
Author: zmedico |
| 2 |
Date: 2008-08-01 22:22:29 +0000 (Fri, 01 Aug 2008) |
| 3 |
New Revision: 11315 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/vartree.py |
| 7 |
Log: |
| 8 |
* Add INHERITED to vardbapi._aux_cache_keys since Package.metadata_keys also |
| 9 |
includes this one now. |
| 10 |
* Fix pull_me calculation inside vardbapi.aux_get() so that it correctly |
| 11 |
subtracts _mtime_ from the list of keys to pull. |
| 12 |
|
| 13 |
|
| 14 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 15 |
=================================================================== |
| 16 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-08-01 21:56:26 UTC (rev 11314) |
| 17 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-08-01 22:22:29 UTC (rev 11315) |
| 18 |
@@ -339,7 +339,7 @@ |
| 19 |
self.vartree = vartree |
| 20 |
self._aux_cache_keys = set( |
| 21 |
["CHOST", "COUNTER", "DEPEND", "DESCRIPTION", |
| 22 |
- "EAPI", "HOMEPAGE", "IUSE", "KEYWORDS", |
| 23 |
+ "EAPI", "HOMEPAGE", "INHERITED", "IUSE", "KEYWORDS", |
| 24 |
"LICENSE", "PDEPEND", "PROVIDE", "RDEPEND", |
| 25 |
"repository", "RESTRICT" , "SLOT", "USE"]) |
| 26 |
self._aux_cache_obj = None |
| 27 |
@@ -772,7 +772,7 @@ |
| 28 |
cache_valid = cache_mtime == mydir_mtime |
| 29 |
if cache_valid: |
| 30 |
mydata.update(metadata) |
| 31 |
- pull_me.difference_update(metadata) |
| 32 |
+ pull_me.difference_update(mydata) |
| 33 |
|
| 34 |
if pull_me: |
| 35 |
# pull any needed data and cache it |
Archives