From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 24 Sep 2009 17:53:17 +0000 (-0400)
Subject: avoid noisy warning message when ssh-askpass not available
X-Git-Tag: monkeysphere_0.27~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e8c2a77f53d65fed90af9fc9c62380fa9c81f858;p=monkeysphere.git

avoid noisy warning message when ssh-askpass not available
---

diff --git a/src/share/common b/src/share/common
index 87a30be..4aa3f7c 100644
--- a/src/share/common
+++ b/src/share/common
@@ -310,7 +310,7 @@ passphrase_prompt() {
     local fifo="$2"
     local PASS
 
-    if [ "$DISPLAY" ] && type "${SSH_ASKPASS:-ssh-askpass}" >/dev/null; then
+    if [ "$DISPLAY" ] && type "${SSH_ASKPASS:-ssh-askpass}" >/dev/null 2>/dev/null; then
 	printf 'Launching "%s"\n' "${SSH_ASKPASS:-ssh-askpass}" | log info
 	printf '(with prompt "%s")\n' "$prompt" | log debug
 	"${SSH_ASKPASS:-ssh-askpass}" "$prompt" > "$fifo"