[Pkg-gnupg-commit] [gnupg2] 04/07: fix upstream bug 2963

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to annotated tag debian/2.1.23-1
in repository gnupg2.

commit 9131ab3ff82d806baf2e368757057acb78013e67
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Fri Aug 11 09:47:23 2017 -0400

    fix upstream bug 2963
---
 ...status-error-on-error-of-quick-revoke-uid.patch | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 31 insertions(+)

diff --git a/debian/patches/0014-g10-Write-status-error-on-error-of-quick-revoke-uid.patch b/debian/patches/0014-g10-Write-status-error-on-error-of-quick-revoke-uid.patch
new file mode 100644
index 0000000..9d5ecbb
--- /dev/null
+++ b/debian/patches/0014-g10-Write-status-error-on-error-of-quick-revoke-uid.patch
@@ -0,0 +1,30 @@
+From: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
+Date: Wed, 9 Aug 2017 18:35:56 +0200
+Subject: =?utf-8?q?g10=3A=C2=A0Write_status_error_on_error_of_--quick-revo?=
+ =?utf-8?q?ke-uid=2E?=
+
+* g10/keyedit.c (keyedit_quick_revuid): Write status error on error.
+
+Signed-off-by: Marcus Brinkmann <mb at g10code.com>
+GnuPG-bug-id: 2963
+(cherry picked from commit 977fc5f0eb9fdee19e66bea8cd2eb5414789b485)
+---
+ g10/keyedit.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/g10/keyedit.c b/g10/keyedit.c
+index e221b32..38cdbce 100644
+--- a/g10/keyedit.c
++++ b/g10/keyedit.c
+@@ -2455,7 +2455,10 @@ keyedit_quick_revuid (ctrl_t ctrl, const char *username, const char *uidtorev)
+ 
+  leave:
+   if (err)
+-    log_error (_("revoking the user ID failed: %s\n"), gpg_strerror (err));
++    {
++      log_error (_("revoking the user ID failed: %s\n"), gpg_strerror (err));
++      write_status_error ("keyedit.revoke.uid", err);
++    }
+   release_kbnode (keyblock);
+   keydb_release (kdbhd);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index cfb3e0d..0bc329a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ gpg-agent-idling/0010-agent-Avoid-tight-timer-tick-when-possible.patch
 gpg-agent-idling/0011-agent-Avoid-scheduled-checks-on-socket-when-inotify-.patch
 skip-missing-signing-keys/0013-g10-Skip-signing-keys-where-no-secret-key-is-availab.patch
 0013-gpg-default-to-no-auto-key-retrieve.patch
+0014-g10-Write-status-error-on-error-of-quick-revoke-uid.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git