summaryrefslogtreecommitdiffstats
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:24 +0100
commitdf69c0257aaa9f4e2f4a20d130b7bc0ce2ca0848 (patch)
treeb888a53111caa1518e5072e1f16795df2329ede2
parentbdf7a362ecdafd47f309b7a21feac4b94624f287 (diff)
downloadbitbake-df69c0257aaa9f4e2f4a20d130b7bc0ce2ca0848.tar.gz
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/siggen.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py
index 40085b9c5..542bbb9d1 100644
--- a/lib/bb/siggen.py
+++ b/lib/bb/siggen.py
@@ -564,7 +564,8 @@ def calc_taskhash(sigdata):
data = data + sigdata['runtaskhashes'][dep]
for c in sigdata['file_checksum_values']:
- data = data + c[1]
+ if c[1]:
+ data = data + c[1]
if 'taint' in sigdata:
if 'nostamp:' in sigdata['taint']: