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:21 +0100
commit1b66c57d0f8a9bd9f9feb2a85759e18d9a1d674b (patch)
tree7c903807e6d57a4afa35f2124a9d9d44df75dc77
parentcc52b9b12c60810142252b9cb5d4268e42371b8e (diff)
downloadbitbake-1b66c57d0f8a9bd9f9feb2a85759e18d9a1d674b.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 169756e25..f71190ad4 100644
--- a/lib/bb/siggen.py
+++ b/lib/bb/siggen.py
@@ -667,7 +667,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']: