warn if keyserver query fails (Closes: MS #1750)

[monkeysphere.git] / src / share / common

diff --git a/src/share/common b/src/share/common
index 21f30656526c2684f49a7d5c54f883fb2f6424a3..cabc378f05729bf29e673ee0499bca55d4911748 100644 (file)
--- a/src/share/common
+++ b/src/share/common
@@ -478,7 +478,7 @@ gpg2ssh() {
     
     keyID="$1"
 
-    gpg --export "$keyID" | openpgp2ssh "$keyID" 2>/dev/null
+    gpg --export --no-armor "$keyID" | openpgp2ssh "$keyID" 2>/dev/null
 }
 
 # output known_hosts line from ssh key
@@ -581,6 +581,10 @@ gpg_fetch_userid() {
        --search ="$userID" &>/dev/null
     returnCode="$?"
 
+    if [ "$returnCode" != 0 ] ; then
+        log error "Failure ($returnCode) searching keyserver $KEYSERVER for user id '$userID'"
+    fi
+
     return "$returnCode"
 }
 
@@ -1200,7 +1204,7 @@ process_authorized_user_ids() {
 list_primary_fingerprints() {
     local fake=$(msmktempdir)
     trap "rm -rf $fake" EXIT
-    GNUPGHOME="$fake" gpg --no-tty --quiet --import --ignore-time-conflict
+    GNUPGHOME="$fake" gpg --no-tty --quiet --import --ignore-time-conflict 2>/dev/null
     GNUPGHOME="$fake" gpg --with-colons --fingerprint --list-keys | \
        awk -F: '/^fpr:/{ print $10 }'
     trap - EXIT
@@ -1213,7 +1217,7 @@ list_primary_fingerprints() {
 get_cert_info() {
     local fake=$(msmktempdir)
     trap "rm -rf $fake" EXIT
-    GNUPGHOME="$fake" gpg --no-tty --quiet --import --ignore-time-conflict
+    GNUPGHOME="$fake" gpg --no-tty --quiet --import --ignore-time-conflict 2>/dev/null
     GNUPGHOME="$fake" gpg --with-colons --fingerprint --fixed-list-mode --list-keys "$1"
     trap - EXIT
     rm -rf "$fake"