[oe-commits] [bitbake] branch 1.30 updated: siggen: Make calc_taskhash match get_taskhash for file checksums

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch 1.30
in repository bitbake.

The following commit(s) were added to refs/heads/1.30 by this push:
     new 51e913e  siggen: Make calc_taskhash match get_taskhash for file checksums
51e913e is described below

commit 51e913e178a02bb603ddf874669e3ce54f90bd5d
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Mon May 29 11:10:18 2017 +0100

    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 at linuxfoundation.org>
---
 lib/bb/siggen.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py
index 6a903b2..74e8d33 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']:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.