[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6120/8267] bitbake: siggen: Make calc_taskhash match get_taskhash for file checksums

[Emmanuele Bassi <ebassi src gnome org>]

commit 5f711bc63e958bbaac50575d4af956dc9505a874
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Mon May 29 11:10:18 2017 +0100

    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>

 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 169756e..f71190a 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/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']: