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:30 +0100
commit51e913e178a02bb603ddf874669e3ce54f90bd5d (patch)
tree5e9dd32c12e28ed436c9b9e34f72d405cfca7a35
parentc60f952a5adb1bcbab403779ce08927759bcfb63 (diff)
downloadbitbake-51e913e178a02bb603ddf874669e3ce54f90bd5d.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 6a903b2fa..74e8d332f 100644
--- a/lib/bb/siggen.py
+++ b/lib/bb/siggen.py
@@ -550,7 +550,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']: