diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2019-09-18 16:51:48 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-19 20:30:35 +0100 |
| commit | 2af45501fd998771b2102b9724be2a6d6a4eab7b (patch) | |
| tree | 7ce602f706a6b9f680a92e7a5be5cf751962be23 /bitbake/lib/bb | |
| parent | e35be7aa7dc73e1f686c8e0d229b3d20f1891853 (diff) | |
| download | poky-2af45501fd998771b2102b9724be2a6d6a4eab7b.tar.gz poky-2af45501fd998771b2102b9724be2a6d6a4eab7b.tar.bz2 poky-2af45501fd998771b2102b9724be2a6d6a4eab7b.zip | |
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/bb')
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 6 |
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: 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) |