Meta/RelBuild: kill GPG agent only if it is still running
Junio C Hamano committed
Aug 27, 2013 at 09:36 UTC
c85809a8bbd1edac43bcc2d738bb400d5f6d059f
1 file changed
+1
-1
RelBuild
+1
-1
index 5ced4f1d96..dc29440050 100755
--- a/RelBuild
+++ b/RelBuild
@@ -30,7 +30,7 @@ GPG_TTY=$(tty) &&
export GPG_TTY &&
eval $(gpg-agent --daemon) &&
GPG_AGENT_PID=$(expr "$GPG_AGENT_INFO" : ".*:\([1-9][0-9]*\):[1-9][0-9]*$") &&
-trap 'kill -0 $GPG_AGENT_PID && kill $GPG_AGENT_PID' 0 1 2 3 15 &&
+trap 'kill -0 2>/dev/null $GPG_AGENT_PID && kill $GPG_AGENT_PID' 0 1 2 3 15 &&
kill -0 "$GPG_AGENT_PID" &&
gpg="gpg --use-agent" || exit