sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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.

(Bitbake rev: ec8a5a495b72e061a1e8d7c7449afb26581872c0)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Chris Larson 2011-06-02 14:46:13 -07:00 committed by Richard Purdie
parent 3eed3aac4c
commit 911e8bb56a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bitbake/lib/bb/siggen.py
View File

@ -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)