diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-11-19 11:46:42 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2011-01-04 14:46:43 +0000 |
commit | 739bb5a2d1c821b8e44c0551bdd0fd323000b6af (patch) | |
tree | c07440b40343cf4b807618f0eae7e5dd1739bda8 /bitbake/lib/bb/shell.py | |
parent | 065da895d2b5eced3e444b20627f8f460e6d14c7 (diff) | |
download | poky-739bb5a2d1c821b8e44c0551bdd0fd323000b6af.tar.gz |
cooker: stop loading the cache for -b
Previously, the cache was actually being loaded from disk twice whenever using
-b or -e -b. This also moves the bb_cache instance into the CookerParser, as
it's not needed by the cooker itself at all.
(Bitbake rev: dd0ec2f7b18e2a9ab06c499b775670516bd06ac8)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/shell.py')
-rw-r--r-- | bitbake/lib/bb/shell.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/bitbake/lib/bb/shell.py b/bitbake/lib/bb/shell.py index c61e93a1cb..3319e2d1cc 100644 --- a/bitbake/lib/bb/shell.py +++ b/bitbake/lib/bb/shell.py | |||
@@ -272,9 +272,7 @@ class BitBakeShellCommands: | |||
272 | bbfile = params[0] | 272 | bbfile = params[0] |
273 | print("SHELL: Parsing '%s'" % bbfile) | 273 | print("SHELL: Parsing '%s'" % bbfile) |
274 | parse.update_mtime( bbfile ) | 274 | parse.update_mtime( bbfile ) |
275 | cooker.bb_cache.cacheValidUpdate(bbfile) | 275 | cooker.parser.reparse(bbfile) |
276 | fromCache = cooker.bb_cache.loadData(bbfile, cooker.configuration.data, cooker.status) | ||
277 | cooker.bb_cache.sync() | ||
278 | if False: #fromCache: | 276 | if False: #fromCache: |
279 | print("SHELL: File has not been updated, not reparsing") | 277 | print("SHELL: File has not been updated, not reparsing") |
280 | else: | 278 | else: |
@@ -443,7 +441,7 @@ SRC_URI = "" | |||
443 | name, var = params | 441 | name, var = params |
444 | bbfile = self._findProvider( name ) | 442 | bbfile = self._findProvider( name ) |
445 | if bbfile is not None: | 443 | if bbfile is not None: |
446 | the_data = cooker.bb_cache.loadDataFull(bbfile, cooker.configuration.data) | 444 | the_data = cache.Cache.loadDataFull(bbfile, cooker.configuration.data) |
447 | value = the_data.getVar( var, 1 ) | 445 | value = the_data.getVar( var, 1 ) |
448 | print(value) | 446 | print(value) |
449 | else: | 447 | else: |