Package: gnupg2 / 2.0.26-6+deb8u2

0009-gpg-Avoid-duplicate-declaration-of-no-sk-comments-no.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
From 3e14da863a668fb0ec1a075722bd0f7b47ae4c1b Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 29 Sep 2014 17:49:52 -0400
Subject: [PATCH 09/31] gpg: Avoid duplicate declaration of {no-,}sk-comments
 noops.

* g10/gpg.c: Cleanup argument parsing.

--

With c76117f8b0165fe5cec5e7f234f55f5a4cd7f0ab, the GnuPG 2.0.x branch
accidentally introduced a second (identical) argument parser for both
--sk-comments, and for --no-sk-comments.

This caused short versions (e.g. omitting the trailing "s", as gpgme
does) of either command to fail with:

   gpg: option "--sk-comment" is ambiguous
---
 g10/gpg.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/g10/gpg.c b/g10/gpg.c
index 12d4295..eefd4ae 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -538,9 +538,6 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_i (oAttributeFD, "attribute-fd", "@"),
   ARGPARSE_s_s (oAttributeFile, "attribute-file", "@"),
 
-  ARGPARSE_s_n (oNoop, "sk-comments", "@"),
-  ARGPARSE_s_n (oNoop, "no-sk-comments", "@"),
-
   ARGPARSE_s_i (oCompletesNeeded, "completes-needed", "@"),
   ARGPARSE_s_i (oMarginalsNeeded, "marginals-needed", "@"),
   ARGPARSE_s_i (oMaxCertDepth,	"max-cert-depth", "@" ),
-- 
2.1.4