summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-29 11:10:18 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-27 13:46:50 +0100
commitc11f1ff584de8f979d6cce5ecb118b3493471f20 (patch)
treecf114761f17b6fde974efcfbb981e08bfc8e78bd /bitbake
parent18341b9dc9a91300c703b2f92052aa04cad74267 (diff)
downloadpoky-c11f1ff584de8f979d6cce5ecb118b3493471f20.tar.gz
bitbake: siggen: Make calc_taskhash match get_taskhash for file checksums
The code in these two functions is meant to be equivlanet in behaviour but isn't. Add in code to ensure files that don't exist are handled consistently by both functions. Users did report being able to generate tracebacks otherwise. (Bitbake rev: 1b66c57d0f8a9bd9f9feb2a85759e18d9a1d674b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/siggen.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index 169756e254..f71190ad4b 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -667,7 +667,8 @@ def calc_taskhash(sigdata):
667 data = data + sigdata['runtaskhashes'][dep] 667 data = data + sigdata['runtaskhashes'][dep]
668 668
669 for c in sigdata['file_checksum_values']: 669 for c in sigdata['file_checksum_values']:
670 data = data + c[1] 670 if c[1]:
671 data = data + c[1]
671 672
672 if 'taint' in sigdata: 673 if 'taint' in sigdata:
673 if 'nostamp:' in sigdata['taint']: 674 if 'nostamp:' in sigdata['taint']: