projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
64f469f
)
still more cleanup in transitions/0.23
author
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Thu, 19 Feb 2009 08:53:41 +0000
(
03:53
-0500)
committer
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Thu, 19 Feb 2009 08:53:41 +0000
(
03:53
-0500)
src/transitions/0.23
patch
|
blob
|
history
diff --git
a/src/transitions/0.23
b/src/transitions/0.23
index 6128d932349b07b9f850fb1e3c15c3734b3f76c0..6cbf99522317856677682730517559ea02c8d82c 100755
(executable)
--- 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"
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
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"
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
GNUPGHOME="$MHDATADIR" gpg --import
monkeysphere-host update-gpg-pub-file