| 1 |
Author: genone |
| 2 |
Date: 2008-05-04 13:00:53 +0000 (Sun, 04 May 2008) |
| 3 |
New Revision: 10180 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/vartree.py |
| 7 |
Log: |
| 8 |
remove NEEDED from list of metadata variables (and associated special handling) as it's no longer used |
| 9 |
|
| 10 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 11 |
=================================================================== |
| 12 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-05-04 12:55:24 UTC (rev 10179) |
| 13 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-05-04 13:00:53 UTC (rev 10180) |
| 14 |
@@ -251,7 +251,7 @@ |
| 15 |
self._aux_cache_keys = set( |
| 16 |
["CHOST", "COUNTER", "DEPEND", "DESCRIPTION", |
| 17 |
"EAPI", "HOMEPAGE", "IUSE", "KEYWORDS", |
| 18 |
- "LICENSE", "PDEPEND", "PROVIDE", "RDEPEND", "NEEDED", |
| 19 |
+ "LICENSE", "PDEPEND", "PROVIDE", "RDEPEND", |
| 20 |
"repository", "RESTRICT" , "SLOT", "USE"]) |
| 21 |
self._aux_cache = None |
| 22 |
self._aux_cache_version = "1" |
| 23 |
@@ -583,12 +583,6 @@ |
| 24 |
cache_valid = cache_mtime == mydir_mtime |
| 25 |
if cache_valid: |
| 26 |
cache_incomplete = self._aux_cache_keys.difference(metadata) |
| 27 |
- needed = metadata.get("NEEDED") |
| 28 |
- if needed is None or needed and "\n" not in needed: |
| 29 |
- # Cached value has whitespace filtered, so it has to be pulled |
| 30 |
- # again. This is temporary migration code which can be removed |
| 31 |
- # later, since it only affects users who are running trunk. |
| 32 |
- cache_incomplete.add("NEEDED") |
| 33 |
if cache_incomplete: |
| 34 |
# Allow self._aux_cache_keys to change without a cache version |
| 35 |
# bump and efficiently recycle partial cache whenever possible. |
| 36 |
@@ -630,8 +624,7 @@ |
| 37 |
myd = myf.read() |
| 38 |
finally: |
| 39 |
myf.close() |
| 40 |
- if x != "NEEDED": |
| 41 |
- myd = " ".join(myd.split()) |
| 42 |
+ myd = " ".join(myd.split()) |
| 43 |
except IOError: |
| 44 |
myd = "" |
| 45 |
if x == "EAPI" and not myd: |
| 46 |
|
| 47 |
-- |
| 48 |
gentoo-commits@l.g.o mailing list |
Archives