[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: gnupload and gpg2

From: Bruno Haible
Subject: Re: gnupload and gpg2
Date: Sat, 19 May 2018 13:02:09 +0200
User-agent: KMail/5.1.3 (Linux/4.4.0-119-generic; KDE/5.18.0; x86_64; ; )

There was no comment from Jim. So I pushed this:

2018-05-19  Bruno Haible  <address@hidden>

        gnupload: Fix "gpg-agent is not available in this session" error.
        * build-aux/gnupload (GPG): Pick the right GNUPG executable to use.

diff --git a/build-aux/gnupload b/build-aux/gnupload
index 2a0bfa3..0d92923 100755
--- a/build-aux/gnupload
+++ b/build-aux/gnupload
@@ -24,7 +24,31 @@ scriptversion=2018-03-07.03; # UTC
 set -e
-GPG='gpg --batch --no-tty'
+# Choose the proper version of gpg, so as to avoid a
+# "gpg-agent is not available in this session" error
+# when gpg-agent is version 2 but gpg is still version 1.
+# This code can go away once all major distributions ship gpg version 2
+# as /usr/bin/gpg.
+gpg_agent_version=`(gpg-agent --version) 2>/dev/null | sed -e '2,$d' -e 
+case "$gpg_agent_version" in
+  2.*)
+    gpg_version=`(gpg --version) 2>/dev/null | sed -e '2,$d' -e 's/^[^0-9]*//'`
+    case "$gpg_version" in
+      1.*)
+        if (type gpg2) >/dev/null 2>/dev/null; then
+          # gpg2 is present.
+          GPG=gpg2
+        else
+          # gpg2 is missing. Ubuntu users should install the package 'gnupg2'.
+          echo "WARNING: Using 'gpg', which is too old. You should install 
'gpg2'." 1>&2
+        fi
+        ;;
+    esac
+    ;;
+GPG="${GPG} --batch --no-tty"

reply via email to

[Prev in Thread] Current Thread [Next in Thread]