diff options
Diffstat (limited to 'bitbake/lib/bb/cache.py')
-rw-r--r-- | bitbake/lib/bb/cache.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index 934d230e6a..335b221979 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py | |||
@@ -39,7 +39,7 @@ except ImportError: | |||
39 | import pickle | 39 | import pickle |
40 | bb.msg.note(1, bb.msg.domain.Cache, "Importing cPickle failed. Falling back to a very slow implementation.") | 40 | bb.msg.note(1, bb.msg.domain.Cache, "Importing cPickle failed. Falling back to a very slow implementation.") |
41 | 41 | ||
42 | __cache_version__ = "125" | 42 | __cache_version__ = "126" |
43 | 43 | ||
44 | class Cache: | 44 | class Cache: |
45 | """ | 45 | """ |
@@ -75,6 +75,9 @@ class Cache: | |||
75 | raise ValueError, 'Cache Version Mismatch' | 75 | raise ValueError, 'Cache Version Mismatch' |
76 | if version_data['BITBAKE_VER'] != bb.__version__: | 76 | if version_data['BITBAKE_VER'] != bb.__version__: |
77 | raise ValueError, 'Bitbake Version Mismatch' | 77 | raise ValueError, 'Bitbake Version Mismatch' |
78 | except EOFError: | ||
79 | bb.msg.note(1, bb.msg.domain.Cache, "Truncated cache found, rebuilding...") | ||
80 | self.depends_cache = {} | ||
78 | except (ValueError, KeyError): | 81 | except (ValueError, KeyError): |
79 | bb.msg.note(1, bb.msg.domain.Cache, "Invalid cache found, rebuilding...") | 82 | bb.msg.note(1, bb.msg.domain.Cache, "Invalid cache found, rebuilding...") |
80 | self.depends_cache = {} | 83 | self.depends_cache = {} |
@@ -251,6 +254,7 @@ class Cache: | |||
251 | """ | 254 | """ |
252 | 255 | ||
253 | pn = self.getVar('PN', file_name, True) | 256 | pn = self.getVar('PN', file_name, True) |
257 | pe = self.getVar('PE', file_name, True) or "0" | ||
254 | pv = self.getVar('PV', file_name, True) | 258 | pv = self.getVar('PV', file_name, True) |
255 | pr = self.getVar('PR', file_name, True) | 259 | pr = self.getVar('PR', file_name, True) |
256 | dp = int(self.getVar('DEFAULT_PREFERENCE', file_name, True) or "0") | 260 | dp = int(self.getVar('DEFAULT_PREFERENCE', file_name, True) or "0") |
@@ -272,7 +276,7 @@ class Cache: | |||
272 | 276 | ||
273 | # build FileName to PackageName lookup table | 277 | # build FileName to PackageName lookup table |
274 | cacheData.pkg_fn[file_name] = pn | 278 | cacheData.pkg_fn[file_name] = pn |
275 | cacheData.pkg_pvpr[file_name] = (pv,pr) | 279 | cacheData.pkg_pepvpr[file_name] = (pe,pv,pr) |
276 | cacheData.pkg_dp[file_name] = dp | 280 | cacheData.pkg_dp[file_name] = dp |
277 | 281 | ||
278 | # Build forward and reverse provider hashes | 282 | # Build forward and reverse provider hashes |
@@ -407,7 +411,7 @@ class CacheData: | |||
407 | self.possible_world = [] | 411 | self.possible_world = [] |
408 | self.pkg_pn = {} | 412 | self.pkg_pn = {} |
409 | self.pkg_fn = {} | 413 | self.pkg_fn = {} |
410 | self.pkg_pvpr = {} | 414 | self.pkg_pepvpr = {} |
411 | self.pkg_dp = {} | 415 | self.pkg_dp = {} |
412 | self.pn_provides = {} | 416 | self.pn_provides = {} |
413 | self.all_depends = Set() | 417 | self.all_depends = Set() |