From: Chris Larson <chris_larson@mentor.com>
Date: Thu, 2 Jun 2011 21:46:13 +0000 (-0700)
Subject: siggen: don't choke with traceback when data is None
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec8a5a495b72e061a1e8d7c7449afb26581872c0;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

siggen: don't choke with traceback when data is None

Given we use bb.error, not bb.fatal, here, it seems this was intended to be
non-fatal, yet we'd end up trying to concatenate None. Fix this by setting an
empty task to the empty string, for the purposes of hashing. Also str() the
value we get from the datastore, just in case something other than a string
was stored there.

Signed-off-by: Chris Larson <chris_larson@mentor.com>
---

diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py
index 550280339c5..a9c84c474fa 100644
--- a/lib/bb/siggen.py
+++ b/lib/bb/siggen.py
@@ -82,6 +82,10 @@ class SignatureGeneratorBasic(SignatureGenerator):
             data = d.getVar(task, False)
             lookupcache[task] = data
 
+            if data is None:
+                bb.error("Task %s from %s seems to be empty?!" % (task, fn))
+                data = ''
+
             newdeps = gendeps[task]
             seen = set()
             while newdeps:
@@ -103,9 +107,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
                     var = d.getVar(dep, False)
                     lookupcache[dep] = var
                 if var:
-                    data = data + var
-            if data is None:
-                bb.error("Task %s from %s seems to be empty?!" % (task, fn))
+                    data = data + str(var)
             self.basehash[fn + "." + task] = hashlib.md5(data).hexdigest()
             taskdeps[task] = sorted(alldeps)