diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-29 11:10:18 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-05 09:19:51 +0100 |
commit | 5f711bc63e958bbaac50575d4af956dc9505a874 (patch) | |
tree | ff1bf8ec8a052edbf79604317f2e5c6576efa92a /bitbake | |
parent | fcf507857f267f723bfb58b33c1e40a748706790 (diff) | |
download | poky-5f711bc63e958bbaac50575d4af956dc9505a874.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: c11b4832879354b387a8c9c6a3096f2d621afeac)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/siggen.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 169756e254..f71190ad4b 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
@@ -667,7 +667,8 @@ def calc_taskhash(sigdata): | |||
667 | data = data + sigdata['runtaskhashes'][dep] | 667 | data = data + sigdata['runtaskhashes'][dep] |
668 | 668 | ||
669 | for c in sigdata['file_checksum_values']: | 669 | for c in sigdata['file_checksum_values']: |
670 | data = data + c[1] | 670 | if c[1]: |
671 | data = data + c[1] | ||
671 | 672 | ||
672 | if 'taint' in sigdata: | 673 | if 'taint' in sigdata: |
673 | if 'nostamp:' in sigdata['taint']: | 674 | if 'nostamp:' in sigdata['taint']: |