From c3271dca21b2f6fa9b54b00a64a176e9d87e8feb Mon Sep 17 00:00:00 2001 From: Joshua Watt Date: Mon, 8 Jun 2020 16:03:10 -0500 Subject: bitbake: bitbake: cache: Fix error when cache is rebuilt It is expected that load_cachfile() returns an integer indicating how many entries were loaded from the cache. In the event the cache needs to be rebuilt, 0 must be returned to prevent python from attempting to add an None and an integer together. (Bitbake rev: 3459d98fbc280637ecb36961bda8436818ee51e5) Signed-off-by: Joshua Watt Signed-off-by: Richard Purdie --- bitbake/lib/bb/cache.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/bb/cache.py') diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index df78d5b701..be5ea6a8bd 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py @@ -464,14 +464,14 @@ class Cache(NoCache): bitbake_ver = pickled.load() except Exception: self.logger.info('Invalid cache, rebuilding...') - return + return 0 if cache_ver != __cache_version__: self.logger.info('Cache version mismatch, rebuilding...') - return + return 0 elif bitbake_ver != bb.__version__: self.logger.info('Bitbake version mismatch, rebuilding...') - return + return 0 # Load the rest of the cache file current_progress = 0 -- cgit v1.2.3-54-g00ecf