mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: runqueue: validate_hashes(): currentcount should be a number

Browse Source 
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>
This commit is contained in:
Robert Yang
2019-09-18 16:51:48 +08:00
committed by Richard Purdie
parent e35be7aa7d
commit 2af45501fd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/runqueue.py
+3 -3
View File
@@ -1394,7 +1394,7 @@ class RunQueue:
cache[tid] = iscurrent cache[tid] = iscurrent
return iscurrent return iscurrent
def validate_hashes(self, tocheck, data, currentcount=None, siginfo=False): def validate_hashes(self, tocheck, data, currentcount=0, siginfo=False):
valid = set() valid = set()
if self.hashvalidate: if self.hashvalidate:
sq_data = {} sq_data = {}
@@ -1601,7 +1601,7 @@ class RunQueue:
tocheck.add(tid) tocheck.add(tid)
valid_new = self.validate_hashes(tocheck, self.cooker.data, None, True) valid_new = self.validate_hashes(tocheck, self.cooker.data, 0, True)
# Tasks which are both setscene and noexec never care about dependencies # Tasks which are both setscene and noexec never care about dependencies
# We therefore find tasks which are setscene and noexec and mark their # We therefore find tasks which are setscene and noexec and mark their
@@ -1982,7 +1982,7 @@ class RunQueueExecute:
continue continue
logger.debug(1, "Task %s no longer deferred" % nexttask) logger.debug(1, "Task %s no longer deferred" % nexttask)
del self.sq_deferred[nexttask] del self.sq_deferred[nexttask]
valid = self.rq.validate_hashes(set([nexttask]), self.cooker.data, None, False) valid = self.rq.validate_hashes(set([nexttask]), self.cooker.data, 0, False)
if not valid: if not valid:
logger.debug(1, "%s didn't become valid, skipping setscene" % nexttask) logger.debug(1, "%s didn't become valid, skipping setscene" % nexttask)
self.sq_task_failoutright(nexttask) self.sq_task_failoutright(nexttask)