summaryrefslogtreecommitdiff
path: root/src/transitions
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-02-19 03:53:41 -0500
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-02-19 03:53:41 -0500
commitb5555eed1dbd5cfd8ea713cfee33ce8ddcf9238f (patch)
tree16d967063363b75f57bc312eef69469e591d1e71 /src/transitions
parent64f469fda70f42699f0f2ccb786d23e09b513d6e (diff)
still more cleanup in transitions/0.23
Diffstat (limited to 'src/transitions')
-rwxr-xr-xsrc/transitions/0.234
1 files changed, 2 insertions, 2 deletions
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