dump gpg --import error spew to /dev/null during hackish uses of gpg

[monkeysphere.git] / src / share / common

diff --git a/src/share/common b/src/share/common
index 039c06cb804a2d267768c0b846cd1e79e0a04e22..e735319800f36930fa26c0d488d59534254f4811 100644 (file)
--- a/src/share/common
+++ b/src/share/common
@@ -1200,7 +1200,7 @@ process_authorized_user_ids() {
 list_primary_fingerprints() {
     local fake=$(msmktempdir)
     trap "rm -rf $fake" EXIT
-    GNUPGHOME="$fake" gpg --no-tty --quiet --import
+    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,8 +1213,8 @@ list_primary_fingerprints() {
 get_cert_info() {
     local fake=$(msmktempdir)
     trap "rm -rf $fake" EXIT
-    GNUPGHOME="$fake" gpg --no-tty --quiet --import
-    GNUPGHOME="$fake" gpg --with-colons --fingerprint --list-keys "$1"
+    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"
 }