runqueue: validate_hashes(): currentcount should be a number
cover runqueue: validate_hashes(): currentcount should be a number
The following changes since commit f025010ee02130bd7f6bd6073a9a0b111aaa9936:
bitbake: runqueue/siggen: Optimise hash equiv queries (2019-09-16 23:02:45 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/runqueue
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/runqueue
Robert Yang (1):
runqueue: validate_hashes(): currentcount should be a number
bitbake/lib/bb/runqueue.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/1 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
Quoted 1 line
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/lib/bb/runqueue.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
bitbake/lib/bb/runqueue.py +4 -4
@@ -1394,7 +1394,7 @@ class RunQueue: cache[tid] = 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() if self.hashvalidate: sq_data = {}
@@ -1601,7 +1601,7 @@ class RunQueue: 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 # We therefore find tasks which are setscene and noexec and mark their
@@ -1982,7 +1982,7 @@ class RunQueueExecute: continue logger.debug(1, "Task %s no longer 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: logger.debug(1, "%s didn't become valid, skipping setscene" % nexttask) self.sq_task_failoutright(nexttask)
@@ -2299,7 +2299,7 @@ class RunQueueExecute: for tid in changed: if tid not in self.rqdata.runq_setscene_tids: continue - valid = self.rq.validate_hashes(set([tid]), self.cooker.data, None, False) + valid = self.rq.validate_hashes(set([tid]), self.cooker.data, 0, False) if not valid: continue if tid in self.runq_running:
Signature · 1 line
2.7.4