From 8fc7a7c0f6c540302d019c6bc2135766215b46a6 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 19 May 2018 12:01:06 -0700 Subject: [PATCH] gnupload: adjust comment * build-aux/gnupload: Add FIXME-2020 comment, to make it slightly more likely we'll remove the just-added code in a year or two. --- ChangeLog | 6 ++++++ build-aux/gnupload | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 047dadf657..7414575996 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-05-19 Jim Meyering + + gnupload: adjust comment + * build-aux/gnupload: Add FIXME-2020 comment, to make it slightly + more likely we'll remove the just-added code in a year or two. + 2018-05-19 Bruno Haible gnupload: Fix "gpg-agent is not available in this session" error. diff --git a/build-aux/gnupload b/build-aux/gnupload index 0d92923eaf..37d7b6806b 100755 --- a/build-aux/gnupload +++ b/build-aux/gnupload @@ -1,7 +1,7 @@ #!/bin/sh # Sign files and upload them. -scriptversion=2018-03-07.03; # UTC +scriptversion=2018-05-19.18; # UTC # Copyright (C) 2004-2018 Free Software Foundation, Inc. # @@ -28,8 +28,7 @@ GPG=gpg # 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. +# FIXME-2020: remove, once all major distros ship gpg version 2 as /usr/bin/gpg gpg_agent_version=`(gpg-agent --version) 2>/dev/null | sed -e '2,$d' -e 's/^[^0-9]*//'` case "$gpg_agent_version" in 2.*) -- 2.39.5