diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2017-06-14 16:11:39 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-18 22:38:26 +0100 |
| commit | e22b1f1c0e57c6ada4fb044791159546e2260dad (patch) | |
| tree | 1892a7ff86256e9041fad2331a63cccc4c9bfa9c /lib/bb/cache.py | |
| parent | 4dbf4f1907a32f303c2e9acf2f27817cf3c9ec38 (diff) | |
| download | bitbake-contrib-e22b1f1c0e57c6ada4fb044791159546e2260dad.tar.gz | |
cache.py: fix whitespace
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/cache.py')
| -rw-r--r-- | lib/bb/cache.py | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/lib/bb/cache.py b/lib/bb/cache.py index 514399269..86ce0e786 100644 --- a/lib/bb/cache.py +++ b/lib/bb/cache.py @@ -86,9 +86,9 @@ class RecipeInfoCommon(object): class CoreRecipeInfo(RecipeInfoCommon): __slots__ = () - cachefile = "bb_cache.dat" + cachefile = "bb_cache.dat" - def __init__(self, filename, metadata): + def __init__(self, filename, metadata): self.file_depends = metadata.getVar('__depends', False) self.timestamp = bb.parse.cached_mtime(filename) self.variants = self.listvar('__VARIANTS', metadata) + [''] @@ -122,7 +122,7 @@ class CoreRecipeInfo(RecipeInfoCommon): self.defaultpref = self.intvar('DEFAULT_PREFERENCE', metadata) self.not_world = self.getvar('EXCLUDE_FROM_WORLD', metadata) self.stamp = self.getvar('STAMP', metadata) - self.stampclean = self.getvar('STAMPCLEAN', metadata) + self.stampclean = self.getvar('STAMPCLEAN', metadata) self.stamp_extrainfo = self.flaglist('stamp-extra-info', self.tasks, metadata) self.file_checksums = self.flaglist('file-checksums', self.tasks, metadata, True) self.packages_dynamic = self.listvar('PACKAGES_DYNAMIC', metadata) @@ -375,8 +375,8 @@ class Cache(NoCache): data = databuilder.data # Pass caches_array information into Cache Constructor - # It will be used later for deciding whether we - # need extra cache file dump/load support + # It will be used later for deciding whether we + # need extra cache file dump/load support self.caches_array = caches_array self.cachedir = data.getVar("CACHE") self.clean = set() @@ -421,7 +421,7 @@ class Cache(NoCache): cachesize += os.fstat(cachefile.fileno()).st_size bb.event.fire(bb.event.CacheLoadStarted(cachesize), self.data) - + for cache_class in self.caches_array: cachefile = getCacheFile(self.cachedir, cache_class.cachefile, self.data_hash) with open(cachefile, "rb") as cachefile: @@ -438,8 +438,8 @@ class Cache(NoCache): logger.info('Cache version mismatch, rebuilding...') return elif bitbake_ver != bb.__version__: - logger.info('Bitbake version mismatch, rebuilding...') - return + logger.info('Bitbake version mismatch, rebuilding...') + return # Load the rest of the cache file current_progress = 0 @@ -616,13 +616,13 @@ class Cache(NoCache): a = fl.find(":True") b = fl.find(":False") if ((a < 0) and b) or ((b > 0) and (b < a)): - f = fl[:b+6] - fl = fl[b+7:] + f = fl[:b+6] + fl = fl[b+7:] elif ((b < 0) and a) or ((a > 0) and (a < b)): - f = fl[:a+5] - fl = fl[a+6:] + f = fl[:a+5] + fl = fl[a+6:] else: - break + break fl = fl.strip() if "*" in f: continue @@ -886,4 +886,3 @@ class MultiProcessCache(object): p.dump([data, self.__class__.CACHE_VERSION]) bb.utils.unlockfile(glf) - |