| 1 |
Author: zmedico |
| 2 |
Date: 2008-09-26 21:40:55 +0000 (Fri, 26 Sep 2008) |
| 3 |
New Revision: 11561 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/ebuild.sh |
| 7 |
main/trunk/bin/repoman |
| 8 |
main/trunk/pym/_emerge/__init__.py |
| 9 |
main/trunk/pym/portage/dbapi/bintree.py |
| 10 |
main/trunk/pym/portage/dbapi/porttree.py |
| 11 |
main/trunk/pym/portage/dbapi/vartree.py |
| 12 |
Log: |
| 13 |
Add PROPERTIES to all of the metadata caches. |
| 14 |
|
| 15 |
|
| 16 |
Modified: main/trunk/bin/ebuild.sh |
| 17 |
=================================================================== |
| 18 |
--- main/trunk/bin/ebuild.sh 2008-09-26 19:20:04 UTC (rev 11560) |
| 19 |
+++ main/trunk/bin/ebuild.sh 2008-09-26 21:40:55 UTC (rev 11561) |
| 20 |
@@ -1022,7 +1022,7 @@ |
| 21 |
for f in ASFLAGS CATEGORY CBUILD CC CFLAGS CHOST CTARGET CXX \ |
| 22 |
CXXFLAGS DEPEND EXTRA_ECONF EXTRA_EINSTALL EXTRA_MAKE \ |
| 23 |
FEATURES INHERITED IUSE LDFLAGS LIBCFLAGS LIBCXXFLAGS \ |
| 24 |
- LICENSE PDEPEND PF PKGUSE PROVIDE RDEPEND RESTRICT SLOT \ |
| 25 |
+ LICENSE PDEPEND PF PKGUSE PROPERTIES PROVIDE RDEPEND RESTRICT SLOT \ |
| 26 |
KEYWORDS HOMEPAGE SRC_URI DESCRIPTION; do |
| 27 |
[ -n "${!f}" ] && echo $(echo "${!f}" | \ |
| 28 |
tr '\n,\r,\t' ' , , ' | sed s/' \+'/' '/g) > ${f} |
| 29 |
|
| 30 |
Modified: main/trunk/bin/repoman |
| 31 |
=================================================================== |
| 32 |
--- main/trunk/bin/repoman 2008-09-26 19:20:04 UTC (rev 11560) |
| 33 |
+++ main/trunk/bin/repoman 2008-09-26 21:40:55 UTC (rev 11561) |
| 34 |
@@ -534,9 +534,8 @@ |
| 35 |
root_config = RootConfig(repoman_settings, trees["/"], setconfig) |
| 36 |
# We really only need to cache the metadata that's necessary for visibility |
| 37 |
# filtering. Anything else can be discarded to reduce memory consumption. |
| 38 |
-for k in ("DEPEND", "LICENCE", "PDEPEND", |
| 39 |
- "PROVIDE", "RDEPEND", "RESTRICT", "repository"): |
| 40 |
- portdb._aux_cache_keys.discard(k) |
| 41 |
+portdb._aux_cache_keys.clear() |
| 42 |
+portdb._aux_cache_keys.update(["EAPI", "KEYWORDS", "SLOT"]) |
| 43 |
# dep_zapdeps looks at the vardbapi, but it shouldn't for repoman. |
| 44 |
del trees["/"]["vartree"] |
| 45 |
|
| 46 |
|
| 47 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 48 |
=================================================================== |
| 49 |
--- main/trunk/pym/_emerge/__init__.py 2008-09-26 19:20:04 UTC (rev 11560) |
| 50 |
+++ main/trunk/pym/_emerge/__init__.py 2008-09-26 21:40:55 UTC (rev 11561) |
| 51 |
@@ -1412,7 +1412,7 @@ |
| 52 |
"CHOST", "COUNTER", "DEPEND", "EAPI", |
| 53 |
"INHERITED", "IUSE", "KEYWORDS", |
| 54 |
"LICENSE", "PDEPEND", "PROVIDE", "RDEPEND", |
| 55 |
- "repository", "RESTRICT", "SLOT", "USE", "_mtime_"] |
| 56 |
+ "repository", "PROPERTIES", "RESTRICT", "SLOT", "USE", "_mtime_"] |
| 57 |
|
| 58 |
def __init__(self, **kwargs): |
| 59 |
Task.__init__(self, **kwargs) |
| 60 |
|
| 61 |
Modified: main/trunk/pym/portage/dbapi/bintree.py |
| 62 |
=================================================================== |
| 63 |
--- main/trunk/pym/portage/dbapi/bintree.py 2008-09-26 19:20:04 UTC (rev 11560) |
| 64 |
+++ main/trunk/pym/portage/dbapi/bintree.py 2008-09-26 21:40:55 UTC (rev 11561) |
| 65 |
@@ -32,7 +32,7 @@ |
| 66 |
# Selectively cache metadata in order to optimize dep matching. |
| 67 |
self._aux_cache_keys = set( |
| 68 |
["CHOST", "DEPEND", "EAPI", "IUSE", "KEYWORDS", |
| 69 |
- "LICENSE", "PDEPEND", "PROVIDE", |
| 70 |
+ "LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE", |
| 71 |
"RDEPEND", "repository", "RESTRICT", "SLOT", "USE"]) |
| 72 |
self._aux_cache_slot_dict = slot_dict_class(self._aux_cache_keys) |
| 73 |
self._aux_cache = {} |
| 74 |
@@ -154,7 +154,7 @@ |
| 75 |
self._pkgindex_keys.update(["CPV", "MTIME", "SIZE"]) |
| 76 |
self._pkgindex_aux_keys = \ |
| 77 |
["CHOST", "DEPEND", "DESCRIPTION", "EAPI", |
| 78 |
- "IUSE", "KEYWORDS", "LICENSE", "PDEPEND", |
| 79 |
+ "IUSE", "KEYWORDS", "LICENSE", "PDEPEND", "PROPERTIES", |
| 80 |
"PROVIDE", "RDEPEND", "repository", "SLOT", "USE"] |
| 81 |
self._pkgindex_aux_keys = list(self._pkgindex_aux_keys) |
| 82 |
self._pkgindex_header_keys = set(["ACCEPT_KEYWORDS", "CBUILD", |
| 83 |
@@ -168,6 +168,7 @@ |
| 84 |
"LICENSE" : "", |
| 85 |
"PATH" : "", |
| 86 |
"PDEPEND" : "", |
| 87 |
+ "PROPERTIES" : "", |
| 88 |
"PROVIDE" : "", |
| 89 |
"RDEPEND" : "", |
| 90 |
"RESTRICT": "", |
| 91 |
|
| 92 |
Modified: main/trunk/pym/portage/dbapi/porttree.py |
| 93 |
=================================================================== |
| 94 |
--- main/trunk/pym/portage/dbapi/porttree.py 2008-09-26 19:20:04 UTC (rev 11560) |
| 95 |
+++ main/trunk/pym/portage/dbapi/porttree.py 2008-09-26 21:40:55 UTC (rev 11561) |
| 96 |
@@ -195,7 +195,7 @@ |
| 97 |
# Selectively cache metadata in order to optimize dep matching. |
| 98 |
self._aux_cache_keys = set( |
| 99 |
["DEPEND", "EAPI", "INHERITED", "IUSE", "KEYWORDS", "LICENSE", |
| 100 |
- "PDEPEND", "PROVIDE", "RDEPEND", "repository", |
| 101 |
+ "PDEPEND", "PROPERTIES", "PROVIDE", "RDEPEND", "repository", |
| 102 |
"RESTRICT", "SLOT"]) |
| 103 |
|
| 104 |
# Repoman modifies _aux_cache_keys, so delay _aux_cache_slot_dict |
| 105 |
|
| 106 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 107 |
=================================================================== |
| 108 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-09-26 19:20:04 UTC (rev 11560) |
| 109 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-09-26 21:40:55 UTC (rev 11561) |
| 110 |
@@ -637,7 +637,7 @@ |
| 111 |
self._aux_cache_keys = set( |
| 112 |
["CHOST", "COUNTER", "DEPEND", "DESCRIPTION", |
| 113 |
"EAPI", "HOMEPAGE", "IUSE", "KEYWORDS", |
| 114 |
- "LICENSE", "PDEPEND", "PROVIDE", "RDEPEND", |
| 115 |
+ "LICENSE", "PDEPEND", "PROPERTIES", "PROVIDE", "RDEPEND", |
| 116 |
"repository", "RESTRICT" , "SLOT", "USE"]) |
| 117 |
self._aux_cache_obj = None |
| 118 |
self._aux_cache_filename = os.path.join(self.root, |
Archives