[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5518/8267] bitbake: bitbake-diffsigs: properly report which signature is missing

[Emmanuele Bassi <ebassi src gnome org>]

commit 8f6094135bc533013491168a39e1fc0106103ff8
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Fri Apr 7 09:52:03 2017 +1200

    bitbake: 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.
    
    (Bitbake rev: c87764b9147792a10efad3ed5378f36f0a055bc6)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/bin/bitbake-diffsigs |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/bitbake/bin/bitbake-diffsigs b/bitbake/bin/bitbake-diffsigs
index b2ebe91..f84188d 100755
--- a/bitbake/bin/bitbake-diffsigs
+++ b/bitbake/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