diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-01-20 18:39:00 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-01-20 18:39:00 +0000 |
| commit | 1bfd6edef9db9c9175058ae801d1b601e4f15263 (patch) | |
| tree | 899bc6771c9def07be628ba735c6bad158f7363e /bitbake-dev/lib/bb/cooker.py | |
| parent | d6c7a44b94aa0f871d3ad1a2097a4a8d773eabf5 (diff) | |
| download | openembedded-core-1bfd6edef9db9c9175058ae801d1b601e4f15263.tar.gz openembedded-core-1bfd6edef9db9c9175058ae801d1b601e4f15263.tar.bz2 openembedded-core-1bfd6edef9db9c9175058ae801d1b601e4f15263.tar.xz openembedded-core-1bfd6edef9db9c9175058ae801d1b601e4f15263.zip | |
bitbake-dev: Sync with bitbake upstream
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake-dev/lib/bb/cooker.py')
| -rw-r--r-- | bitbake-dev/lib/bb/cooker.py | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/bitbake-dev/lib/bb/cooker.py b/bitbake-dev/lib/bb/cooker.py index 25131b740..8036d7e9d 100644 --- a/bitbake-dev/lib/bb/cooker.py +++ b/bitbake-dev/lib/bb/cooker.py @@ -923,11 +923,13 @@ class CookerParser: # Accounting statistics self.parsed = 0 self.cached = 0 - self.skipped = 0 self.error = 0 self.masked = masked self.total = len(filelist) + self.skipped = 0 + self.virtuals = 0 + # Pointer to the next file to parse self.pointer = 0 @@ -937,13 +939,14 @@ class CookerParser: cooker = self.cooker try: - fromCache, skip = cooker.bb_cache.loadData(f, cooker.configuration.data, cooker.status) - if skip: - self.skipped += 1 - bb.msg.debug(2, bb.msg.domain.Collection, "skipping %s" % f) - cooker.bb_cache.skip(f) - elif fromCache: self.cached += 1 - else: self.parsed += 1 + fromCache, skipped, virtuals = cooker.bb_cache.loadData(f, cooker.configuration.data, cooker.status) + if fromCache: + self.cached += 1 + else: + self.parsed += 1 + + self.skipped += skipped + self.virtuals += virtuals except IOError, e: self.error += 1 @@ -962,7 +965,7 @@ class CookerParser: cooker.bb_cache.remove(f) raise finally: - bb.event.fire(bb.event.ParseProgress(self.cached, self.parsed, self.skipped, self.masked, self.error, self.total), cooker.configuration.event_data) + bb.event.fire(bb.event.ParseProgress(self.cached, self.parsed, self.skipped, self.masked, self.virtuals, self.error, self.total), cooker.configuration.event_data) self.pointer += 1 |