[bitbake-devel] Richard Purdie : bitbake/siggen.py: Don' t backtrace if the taskhash data isn't present

[git at git.openembedded.org]

Module: bitbake.git
Branch: master
Commit: 5ace320ccc01f4e326f90b7ba060dcbff3380dca
URL:    http://git.openembedded.org/?p=bitbake.git&a=commit;h=5ace320ccc01f4e326f90b7ba060dcbff3380dca

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Fri Nov 25 11:20:33 2011 +0000

bitbake/siggen.py: Don't backtrace if the taskhash data isn't present

This allows the code to safely fall back to dumping the basehash data
if the taskhash data isn't present for some reason. We could effecitvely
obsolete the runtime option and use this approach instead exclusively.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 lib/bb/siggen.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py
index 7580742..91b4160 100644
--- a/lib/bb/siggen.py
+++ b/lib/bb/siggen.py
@@ -159,7 +159,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
         k = fn + "." + task
         if runtime == "customfile":
             sigfile = stampbase
-        elif runtime:
+        elif runtime and k in self.taskhash:
             sigfile = stampbase + "." + task + ".sigdata" + "." + self.taskhash[k]
         else:
             sigfile = stampbase + "." + task + ".sigbasedata" + "." + self.basehash[k]
@@ -180,7 +180,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
             data['gendeps'][dep] = self.gendeps[fn][dep]
             data['varvals'][dep] = self.lookupcache[fn][dep]
 
-        if runtime:
+        if runtime and k in self.taskhash:
             data['runtaskdeps'] = self.runtaskdeps[k]
             data['runtaskhashes'] = {}
             for dep in data['runtaskdeps']: