[packages/rpm-build-tools/merge-pld-builder-client: 260/2675] - keep gpg stdin clear, so curses based gpg-agent could work

[glen]

commit 9e6d6bd91ac8f0c242b5890f5e90c53254be8b77
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Mon Jun 11 14:40:35 2012 +0000

    - keep gpg stdin clear, so curses based gpg-agent could work
    
    Changed files:
        client/make-request.sh -> 1.104

 make-request.sh | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)
---
diff --git a/make-request.sh b/make-request.sh
index dd7f558..98423db 100755
--- a/make-request.sh
+++ b/make-request.sh
@@ -757,21 +757,26 @@ gen_req() {
 
 gen_email () {
 	# make request first, so the STDERR/STDOUT streams won't be mixed
-	local req=$(gen_req)
+	local tmp req
+	tmp=$(mktemp)
+	gen_req > $tmp
 
 	if [ "$verbose" = "yes" ]; then
-		echo >&2 -E "$req"
+		cat $tmp >&2
 	fi
-cat <<EOF
-From: $requester
-To: $builder_email
-Subject: build request
-Message-Id: <$id@$(hostname)>
-X-New-PLD-Builder: request
-X-Requester-Version: \$Id$
-
-$(echo -E "$req" | gpg --clearsign --default-key $default_key $gpg_opts)
-EOF
+
+	cat <<-EOF
+	From: $requester
+	To: $builder_email
+	Subject: build request
+	Message-Id: <$id@$(hostname)>
+	X-New-PLD-Builder: request
+	X-Requester-Version: \$Id$
+
+	EOF
+
+	gpg --clearsign --default-key $default_key $gpg_opts --output=- $tmp
+	rm -f $tmp
 }
 
 gen_email | send_request
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/cca6584b96e6c33d0732d559e43e100d804e2ecd