From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 19 Jan 2010 07:36:20 +0000 (-0500)
Subject: ignoring time conflict when extracting info in a hacky way from gpg.  warnings still... 
X-Git-Tag: monkeysphere_0.28~7
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=e1853a59e0421ee61b5066179632b9fc31116717;p=monkeysphere.git

ignoring time conflict when extracting info in a hacky way from gpg.  warnings still come out to stderr
---

diff --git a/src/share/common b/src/share/common
index 039c06c..21f3065 100644
--- 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
     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
+    GNUPGHOME="$fake" gpg --with-colons --fingerprint --fixed-list-mode --list-keys "$1"
     trap - EXIT
     rm -rf "$fake"
 }