summaryrefslogtreecommitdiffstats
path: root/bitbake-dev/lib/bb/cooker.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake-dev/lib/bb/cooker.py')
-rw-r--r--bitbake-dev/lib/bb/cooker.py21
1 files changed, 12 insertions, 9 deletions
diff --git a/bitbake-dev/lib/bb/cooker.py b/bitbake-dev/lib/bb/cooker.py
index 25131b7406..8036d7e9d5 100644
--- a/bitbake-dev/lib/bb/cooker.py
+++ b/bitbake-dev/lib/bb/cooker.py
@@ -923,11 +923,13 @@ class CookerParser:
923 # Accounting statistics 923 # Accounting statistics
924 self.parsed = 0 924 self.parsed = 0
925 self.cached = 0 925 self.cached = 0
926 self.skipped = 0
927 self.error = 0 926 self.error = 0
928 self.masked = masked 927 self.masked = masked
929 self.total = len(filelist) 928 self.total = len(filelist)
930 929
930 self.skipped = 0
931 self.virtuals = 0
932
931 # Pointer to the next file to parse 933 # Pointer to the next file to parse
932 self.pointer = 0 934 self.pointer = 0
933 935
@@ -937,13 +939,14 @@ class CookerParser:
937 cooker = self.cooker 939 cooker = self.cooker
938 940
939 try: 941 try:
940 fromCache, skip = cooker.bb_cache.loadData(f, cooker.configuration.data, cooker.status) 942 fromCache, skipped, virtuals = cooker.bb_cache.loadData(f, cooker.configuration.data, cooker.status)
941 if skip: 943 if fromCache:
942 self.skipped += 1 944 self.cached += 1
943 bb.msg.debug(2, bb.msg.domain.Collection, "skipping %s" % f) 945 else:
944 cooker.bb_cache.skip(f) 946 self.parsed += 1
945 elif fromCache: self.cached += 1 947
946 else: self.parsed += 1 948 self.skipped += skipped
949 self.virtuals += virtuals
947 950
948 except IOError, e: 951 except IOError, e:
949 self.error += 1 952 self.error += 1
@@ -962,7 +965,7 @@ class CookerParser:
962 cooker.bb_cache.remove(f) 965 cooker.bb_cache.remove(f)
963 raise 966 raise
964 finally: 967 finally:
965 bb.event.fire(bb.event.ParseProgress(self.cached, self.parsed, self.skipped, self.masked, self.error, self.total), cooker.configuration.event_data) 968 bb.event.fire(bb.event.ParseProgress(self.cached, self.parsed, self.skipped, self.masked, self.virtuals, self.error, self.total), cooker.configuration.event_data)
966 969
967 self.pointer += 1 970 self.pointer += 1
968 971