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:44 +0100
commitfd7f2d644a94bbb951c0bed11af7deb35f1cfb22 (patch)
treeb414eb7d5c721505773701bb9d701a4ae97f5d21
parentd4b41223d39f89e3e9f1217d92759adccc8bde2a (diff)
downloadpoky-fd7f2d644a94bbb951c0bed11af7deb35f1cfb22.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: df69c0257aaa9f4e2f4a20d130b7bc0ce2ca0848) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 40085b9c54..542bbb9d13 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -564,7 +564,8 @@ def calc_taskhash(sigdata):
564 data = data + sigdata['runtaskhashes'][dep] 564 data = data + sigdata['runtaskhashes'][dep]
565 565
566 for c in sigdata['file_checksum_values']: 566 for c in sigdata['file_checksum_values']:
567 data = data + c[1] 567 if c[1]:
568 data = data + c[1]
568 569
569 if 'taint' in sigdata: 570 if 'taint' in sigdata:
570 if 'nostamp:' in sigdata['taint']: 571 if 'nostamp:' in sigdata['taint']: