[gnome-continuous-yocto/gnomeostree-3.22-krogoth: 239/246] bitbake: siggen: Make calc_taskhash match get_taskhash for file checksums



commit 3cf0e093481ea260d4f41bed24336ea7f0102bde
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: 51e913e178a02bb603ddf874669e3ce54f90bd5d)
    
    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 6a903b2..74e8d33 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/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']:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]