All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paul Eggleton <paul.eggleton@linux.intel.com>
To: bitbake-devel@lists.openembedded.org
Subject: [PATCH 03/11] bitbake-diffsigs: properly report which signature is missing
Date: Fri,  7 Apr 2017 09:52:03 +1200	[thread overview]
Message-ID: <01748f01da49c1a0d7ccdb114c6822b4969ff40d.1491514854.git.paul.eggleton@linux.intel.com> (raw)
In-Reply-To: <cover.1491514854.git.paul.eggleton@linux.intel.com>

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>
---
 bin/bitbake-diffsigs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/bin/bitbake-diffsigs b/bin/bitbake-diffsigs
index b2ebe91..f84188d 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
 
-- 
2.9.3



  parent reply	other threads:[~2017-04-06 21:52 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-06 21:52 [PATCH 00/11] bitbake-diffsigs fixes/improvements Paul Eggleton
2017-04-06 21:52 ` [PATCH 01/11] bitbake-diffsigs: fix -t picking wrong files to compare Paul Eggleton
2017-04-06 21:52 ` [PATCH 02/11] lib/bb/siggen: add missing path separator to cleaned paths Paul Eggleton
2017-04-06 21:52 ` Paul Eggleton [this message]
2017-04-07 16:25   ` [PATCH 03/11] bitbake-diffsigs: properly report which signature is missing Patrick Ohly
2017-04-06 21:52 ` [PATCH 04/11] bitbake-diffsigs: drop naive logic for removing duplicate files Paul Eggleton
2017-04-06 21:52 ` [PATCH 05/11] lib/bb/siggen: show a diff when dumping changes to multi-line values Paul Eggleton
2017-04-06 21:52 ` [PATCH 06/11] lib/bb/siggen: don't show unchanged runtaskdeps list Paul Eggleton
2017-04-06 21:52 ` [PATCH 07/11] bitbake-diffsigs: change to use argparse Paul Eggleton
2017-04-06 21:52 ` [PATCH 08/11] bitbake-diffsigs: add an option to find and compare specific signatures Paul Eggleton
2017-04-06 21:52 ` [PATCH 09/11] lib/bb/siggen: add collapsed mode to compare_sigfiles() Paul Eggleton
2017-04-07  6:37   ` Patrick Ohly
2017-04-07  8:26     ` Paul Eggleton
2017-04-06 21:52 ` [PATCH 10/11] lib/bb/siggen: show word-diff for single-line values containing spaces Paul Eggleton
2017-04-06 21:52 ` [PATCH 11/11] bitbake-diffsigs: colourise output Paul Eggleton
2017-04-07  7:56 ` [PATCH 00/11] bitbake-diffsigs fixes/improvements Patrick Ohly
2017-04-07  8:29   ` Paul Eggleton
2017-04-07  8:32     ` Paul Eggleton
2017-04-07  8:54       ` Patrick Ohly
2017-04-07  9:48         ` Paul Eggleton
2017-04-07 12:20 ` Peter Kjellerstedt
2017-04-07 16:46   ` Richard Purdie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=01748f01da49c1a0d7ccdb114c6822b4969ff40d.1491514854.git.paul.eggleton@linux.intel.com \
    --to=paul.eggleton@linux.intel.com \
    --cc=bitbake-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.