summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-29 10:10:18 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-27 12:46:39 (GMT)
commit3cf0e093481ea260d4f41bed24336ea7f0102bde (patch)
tree253512a6cbe20487ee9322ebdc702c1e80cfadc6
parent4515fc952963e233d5f24bb319028e8c68ee7622 (diff)
downloadpoky-krogoth-15.0.3.tar.gz
bitbake: siggen: Make calc_taskhash match get_taskhash for file checksumsyocto-2.1.3krogoth-15.0.3
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: 51e913e178a02bb603ddf874669e3ce54f90bd5d) 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 6a903b2..74e8d33 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -550,7 +550,8 @@ def calc_taskhash(sigdata):
550 data = data + sigdata['runtaskhashes'][dep] 550 data = data + sigdata['runtaskhashes'][dep]
551 551
552 for c in sigdata['file_checksum_values']: 552 for c in sigdata['file_checksum_values']:
553 data = data + c[1] 553 if c[1]:
554 data = data + c[1]
554 555
555 if 'taint' in sigdata: 556 if 'taint' in sigdata:
556 if 'nostamp:' in sigdata['taint']: 557 if 'nostamp:' in sigdata['taint']: