From c87764b9147792a10efad3ed5378f36f0a055bc6 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 7 Apr 2017 09:52:03 +1200 Subject: 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 Signed-off-by: Richard Purdie --- bin/bitbake-diffsigs | 10 +++++++--- 1 file 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 -- cgit 1.2.3-korg