From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 19 Feb 2009 08:53:41 +0000 (-0500)
Subject: still more cleanup in transitions/0.23
X-Git-Tag: monkeysphere_0.23~48
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=b5555eed1dbd5cfd8ea713cfee33ce8ddcf9238f;hp=-c;p=monkeysphere.git

still more cleanup in transitions/0.23
---

b5555eed1dbd5cfd8ea713cfee33ce8ddcf9238f
diff --git a/src/transitions/0.23 b/src/transitions/0.23
index 6128d93..6cbf995 100755
--- a/src/transitions/0.23
+++ b/src/transitions/0.23
@@ -121,7 +121,7 @@ if [ -d "$SYSDATADIR"/gnupg-host ] ; then
 
 			    CERTKEY=$(mktemp ${TMPDIR:-/tmp}/mstransition.XXXXXXXX)
 			    log "Adding identity certifier with fingerprint %s\n" "$keyfpr"
-			    GNUPGHOME="$SYSDATADIR"/gnupg-host gpg --export "0x$keyfpr" --export-clean >"$CERTKEY"
+			    GNUPGHOME="$SYSDATADIR"/gnupg-host gpg --no-permission-warning --export "0x$keyfpr" --export-clean >"$CERTKEY"
 			    MONKEYSPHERE_PROMPT=false monkeysphere-authentication add-identity-certifier $finaldomain --trust "$truststring" --depth "$trustdepth" "$CERTKEY"
 			    rm -f "$CERTKEY"
 			    # clear the fingerprint so that we don't
@@ -148,7 +148,7 @@ if [ -d "$SYSDATADIR"/gnupg-host ] ; then
 	    chmod 0700 "${MHDATADIR}"
 	    
 	    log "importing host key from old monkeysphere installation\n"
-	    GNUPGHOME="$SYSDATADIR"/gnupg-host gpg  --no-permission-warning --export-secret-keys | \
+	    GNUPGHOME="$SYSDATADIR"/gnupg-host gpg --no-permission-warning --export-secret-keys | \
 		GNUPGHOME="$MHDATADIR" gpg --import
 	    
 	    monkeysphere-host update-gpg-pub-file