diff options
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 6a6d254d7a..9f8c71ff13 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -475,13 +475,10 @@ class BBCooker: if not fn: return False - # Load data into the cache for fn + # Load data into the cache for fn and parse the loaded cache data self.bb_cache = bb.cache.init(self) - self.bb_cache.loadData(fn, self.configuration.data) - - # Parse the loaded cache data self.status = bb.cache.CacheData() - self.bb_cache.handle_data(fn, self.status) + self.bb_cache.loadData(fn, self.configuration.data, self.status) # Tweak some variables item = self.bb_cache.getVar('PN', fn, True) @@ -723,7 +720,7 @@ class BBCooker: # read a file's metadata try: - fromCache, skip = self.bb_cache.loadData(f, self.configuration.data) + fromCache, skip = self.bb_cache.loadData(f, self.configuration.data, self.status) if skip: skipped += 1 bb.msg.debug(2, bb.msg.domain.Collection, "skipping %s" % f) @@ -731,7 +728,6 @@ class BBCooker: continue elif fromCache: cached += 1 else: parsed += 1 - deps = None # Disabled by RP as was no longer functional # allow metadata files to add items to BBFILES @@ -744,8 +740,6 @@ class BBCooker: # aof = os.path.join(os.path.dirname(f),aof) # files.append(aof) - self.bb_cache.handle_data(f, self.status) - # now inform the caller if progressCallback is not None: progressCallback( i + 1, len( filelist ), f, fromCache ) |