Merge branch 'eg/p4-submit-catch-failure' into maint

diff --git a/gpg-interface.c b/gpg-interface.c
index 77a4da627e227eb191ce99812f53cc7f90479f1f..3dc2fe397e32d79713780596f0ef4666c14b5955 100644 (file)
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -85,6 +85,18 @@ int check_signature(const char *payload, size_t plen, const char *signature,
        return sigc->result != 'G' && sigc->result != 'U';
 }
 
+void print_signature_buffer(const struct signature_check *sigc, unsigned flags)
+{
+       const char *output = flags & GPG_VERIFY_RAW ?
+               sigc->gpg_status : sigc->gpg_output;
+
+       if (flags & GPG_VERIFY_VERBOSE && sigc->payload)
+               fputs(sigc->payload, stdout);
+
+       if (output)
+               fputs(output, stderr);
+}
+
 /*
  * Look at GPG signed content (e.g. a signed tag object), whose
  * payload is followed by a detached signature on it.  Return the