diff options
Diffstat (limited to 'lib/bb/siggen.py')
| -rw-r--r-- | lib/bb/siggen.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 81b42d12f3..182ce62a76 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -43,7 +43,7 @@ class SignatureGenerator(object): def finalise(self, fn, d, varient): return - def get_taskhash(self, fn, task, deps, dataCache, checksum_cache=None): + def get_taskhash(self, fn, task, deps, dataCache, checksum_cache): return "0" def stampfile(self, stampbase, file_name, taskname, extrainfo): @@ -173,7 +173,7 @@ class SignatureGeneratorBasic(SignatureGenerator): pass return taint - def get_taskhash(self, fn, task, deps, dataCache, checksum_cache=None): + def get_taskhash(self, fn, task, deps, dataCache, checksum_cache): k = fn + "." + task data = dataCache.basetaskhash[k] self.runtaskdeps[k] = [] @@ -190,10 +190,7 @@ class SignatureGeneratorBasic(SignatureGenerator): self.runtaskdeps[k].append(dep) if task in dataCache.file_checksums[fn]: - if checksum_cache: - checksums = checksum_cache.get_checksums(dataCache.file_checksums[fn][task], recipename) - else: - checksums = bb.fetch2.get_file_checksums(dataCache.file_checksums[fn][task], recipename) + checksums = checksum_cache.get_checksums(dataCache.file_checksums[fn][task], recipename) for (f,cs) in checksums: self.file_checksum_values[k].append((f,cs)) if cs: |