Pārlūkot izejas kodu

HADOOP-18334. Fix create-release to address removal of GPG_AGENT_INFO in branch-3.2. (#4554)

(cherry picked from commit 61e3ad6533c5a1cb72b06ab7a59111ed1ff930a7)
Masatake Iwasaki 2 gadi atpakaļ
vecāks
revīzija
c15b872383
1 mainītis faili ar 3 papildinājumiem un 1 dzēšanām
  1. 3 1
      dev-support/bin/create-release

+ 3 - 1
dev-support/bin/create-release

@@ -249,7 +249,9 @@ function startgpgagent
       eval $("${GPGAGENT}" --daemon \
         --options "${LOGDIR}/gpgagent.conf" \
         --log-file="${LOGDIR}/create-release-gpgagent.log")
-      GPGAGENTPID=$(echo "${GPG_AGENT_INFO}" | cut -f 2 -d:)
+      GPGAGENTPID=$(pgrep "${GPGAGENT}")
+      GPG_AGENT_INFO="$HOME/.gnupg/S.gpg-agent:$GPGAGENTPID:1"
+      export GPG_AGENT_INFO
     fi
 
     if [[ -n "${GPG_AGENT_INFO}" ]]; then