[Pkg-gnupg-commit] [gnupg2] 02/07: avoid failures on win32 when gpgconf.exe is not present (from upstream)

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 779435355ff4df3cab7d8a573b90b87640d8607f
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Mar 28 23:17:57 2016 -0400

    avoid failures on win32 when gpgconf.exe is not present (from upstream)
---
 ...not-error-out-if-gpgconf-is-not-installed.patch | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 32 insertions(+)

diff --git a/debian/patches/0006-w32-Do-not-error-out-if-gpgconf-is-not-installed.patch b/debian/patches/0006-w32-Do-not-error-out-if-gpgconf-is-not-installed.patch
new file mode 100644
index 0000000..7984b4d
--- /dev/null
+++ b/debian/patches/0006-w32-Do-not-error-out-if-gpgconf-is-not-installed.patch
@@ -0,0 +1,31 @@
+From: Werner Koch <wk at gnupg.org>
+Date: Tue, 16 Feb 2016 16:07:44 +0100
+Subject: w32: Do not error out if gpgconf is not installed.
+
+* common/homedir.c (check_portable_app): Remove error message.
+--
+
+It is sometimes useful to install just gpgv and no other parts.  Our
+test for a portable application returned an error if gpgconf is not
+installed.  That error is not required but was merely a debug aid.
+
+Signed-off-by: Werner Koch <wk at gnupg.org>
+---
+ common/homedir.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/common/homedir.c b/common/homedir.c
+index 3918693..e0a88fa 100644
+--- a/common/homedir.c
++++ b/common/homedir.c
+@@ -256,9 +256,7 @@ check_portable_app (const char *dir)
+   char *fname;
+ 
+   fname = xstrconcat (dir, DIRSEP_S "gpgconf.exe", NULL);
+-  if (access (fname, F_OK))
+-    log_error ("required binary '%s' is not installed\n", fname);
+-  else
++  if (!access (fname, F_OK))
+     {
+       strcpy (fname + strlen (fname) - 3, "ctl");
+       if (!access (fname, F_OK))
diff --git a/debian/patches/series b/debian/patches/series
index fd437c5..540d51d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Avoid-simple-memory-dumps-via-ptrace.patch
 0004-avoid-gpgtar.test-when-disable-gpgtar-is-configured.patch
 0005-common-Change-simple_query-to-ignore-status-messages.patch
+0006-w32-Do-not-error-out-if-gpgconf-is-not-installed.patch

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