chiark / gitweb /
import-dsc: Actually print signature warning without --require-valid
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 25 Oct 2016 15:42:07 +0000 (16:42 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 30 Oct 2016 19:50:48 +0000 (19:50 +0000)
If --require-valid-signature was not set, we would not print the
warning if there was one.  That is quite wrong.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit

diff --git a/dgit b/dgit
index 19245e0ed1ef2c75c379048149aed8ecea5e04b2..8e72b2aac1c93535faaaf29173e2f46e0b281c67 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -5324,8 +5324,8 @@ sub cmd_import_dsc {
        require_valid_signature => $needsig;
     {
        local $SIG{__WARN__} = sub {
-           return unless $needsig;
            print STDERR $_[0];
+           return unless $needsig;
            fail "import-dsc signature check failed";
        };
        if (!$dp->is_signed()) {