summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2019-09-18 16:51:48 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-19 20:30:35 +0100
commit2af45501fd998771b2102b9724be2a6d6a4eab7b (patch)
tree7ce602f706a6b9f680a92e7a5be5cf751962be23 /bitbake/lib
parente35be7aa7dc73e1f686c8e0d229b3d20f1891853 (diff)
downloadpoky-2af45501fd998771b2102b9724be2a6d6a4eab7b.tar.gz
bitbake: runqueue: validate_hashes(): currentcount should be a number
According to sstate_checkhashes which is defined in sstate.bbclass, the currentcoun should be a number (0, not None). Fixed: $ bitbake base-files -Sprintdiff > bb.plain("Sstate summary: Wanted %d Found %d Missed %d Current %d (%d%% match, %d%% complete)" % (total, len(found), len(missed), currentcount, match, complete)) TypeError: %d format: a number is required, not NoneType (Bitbake rev: 45cb73e2846eaffe8964a573875f54808e8f3633) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/runqueue.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 314a30908b..d9a67a3167 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1394,7 +1394,7 @@ class RunQueue:
1394 cache[tid] = iscurrent 1394 cache[tid] = iscurrent
1395 return iscurrent 1395 return iscurrent
1396 1396
1397 def validate_hashes(self, tocheck, data, currentcount=None, siginfo=False): 1397 def validate_hashes(self, tocheck, data, currentcount=0, siginfo=False):
1398 valid = set() 1398 valid = set()
1399 if self.hashvalidate: 1399 if self.hashvalidate:
1400 sq_data = {} 1400 sq_data = {}
@@ -1601,7 +1601,7 @@ class RunQueue:
1601 1601
1602 tocheck.add(tid) 1602 tocheck.add(tid)
1603 1603
1604 valid_new = self.validate_hashes(tocheck, self.cooker.data, None, True) 1604 valid_new = self.validate_hashes(tocheck, self.cooker.data, 0, True)
1605 1605
1606 # Tasks which are both setscene and noexec never care about dependencies 1606 # Tasks which are both setscene and noexec never care about dependencies
1607 # We therefore find tasks which are setscene and noexec and mark their 1607 # We therefore find tasks which are setscene and noexec and mark their
@@ -1982,7 +1982,7 @@ class RunQueueExecute:
1982 continue 1982 continue
1983 logger.debug(1, "Task %s no longer deferred" % nexttask) 1983 logger.debug(1, "Task %s no longer deferred" % nexttask)
1984 del self.sq_deferred[nexttask] 1984 del self.sq_deferred[nexttask]
1985 valid = self.rq.validate_hashes(set([nexttask]), self.cooker.data, None, False) 1985 valid = self.rq.validate_hashes(set([nexttask]), self.cooker.data, 0, False)
1986 if not valid: 1986 if not valid:
1987 logger.debug(1, "%s didn't become valid, skipping setscene" % nexttask) 1987 logger.debug(1, "%s didn't become valid, skipping setscene" % nexttask)
1988 self.sq_task_failoutright(nexttask) 1988 self.sq_task_failoutright(nexttask)