summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-04-07 09:52:03 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-07 00:51:12 +0100
commitc87764b9147792a10efad3ed5378f36f0a055bc6 (patch)
treedfac69e28d7742c22fc0d556a289193b709fa963
parent55cd4045a37afc954f4d5091f524756b266064fc (diff)
downloadbitbake-c87764b9147792a10efad3ed5378f36f0a055bc6.tar.gz
bitbake-diffsigs: properly report which signature is missing
If just one of the two signatures we want to compare aren't available, report that one rather than misleadingly claiming both are missing. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbin/bitbake-diffsigs10
1 files changed, 7 insertions, 3 deletions
diff --git a/bin/bitbake-diffsigs b/bin/bitbake-diffsigs
index b2ebe91db..f84188d57 100755
--- a/bin/bitbake-diffsigs
+++ b/bin/bitbake-diffsigs
@@ -75,11 +75,15 @@ def find_compare_task(bbhandler, pn, taskname):
hashfiles = bb.siggen.find_siginfo(key, None, hashes, bbhandler.config_data)
recout = []
- if len(hashfiles) == 2:
+ if len(hashfiles) == 0:
+ recout.append("Unable to find matching sigdata for %s with hashes %s or %s" % (key, hash1, hash2))
+ elif not hash1 in hashfiles:
+ recout.append("Unable to find matching sigdata for %s with hash %s" % (key, hash1))
+ elif not hash2 in hashfiles:
+ recout.append("Unable to find matching sigdata for %s with hash %s" % (key, hash2))
+ else:
out2 = bb.siggen.compare_sigfiles(hashfiles[hash1], hashfiles[hash2], recursecb)
recout.extend(list(' ' + l for l in out2))
- else:
- recout.append("Unable to find matching sigdata for %s with hashes %s or %s" % (key, hash1, hash2))
return recout