projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6476671
)
clean up more gpg warnings during 0.23 transition
author
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Thu, 19 Feb 2009 09:11:27 +0000
(
04:11
-0500)
committer
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Thu, 19 Feb 2009 09:11:27 +0000
(
04:11
-0500)
src/transitions/0.23
patch
|
blob
|
history
diff --git
a/src/transitions/0.23
b/src/transitions/0.23
index 6cbf99522317856677682730517559ea02c8d82c..f09dfff4489af8a4d5162e43e73552ffa4864e75 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 --no-permission-warning --export "0x$keyfpr" --export-clean >"$CERTKEY"
+ GNUPGHOME="$SYSDATADIR"/gnupg-host gpg --no-permission-warning --export "0x$keyfpr" --export-
options 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
@@
-149,7
+149,7
@@
if [ -d "$SYSDATADIR"/gnupg-host ] ; then
log "importing host key from old monkeysphere installation\n"
GNUPGHOME="$SYSDATADIR"/gnupg-host gpg --no-permission-warning --export-secret-keys | \
log "importing host key from old monkeysphere installation\n"
GNUPGHOME="$SYSDATADIR"/gnupg-host gpg --no-permission-warning --export-secret-keys | \
- GNUPGHOME="$MHDATADIR" gpg --import
+ GNUPGHOME="$MHDATADIR" gpg --
quiet --no-tty --
import
monkeysphere-host update-gpg-pub-file
else
monkeysphere-host update-gpg-pub-file
else
@@
-171,7
+171,7
@@
fi
# the new authentication keyring.
if [ -d "${SYSDATADIR}/gnupg-authentication" ] ; then
# the new authentication keyring.
if [ -d "${SYSDATADIR}/gnupg-authentication" ] ; then
- GNUPGHOME="${SYSDATADIR}/gnupg-authentication" gpg --export | \
+ GNUPGHOME="${SYSDATADIR}/gnupg-authentication" gpg --
no-permission-warning --
export | \
monkeysphere-authentication gpg-cmd --import
mkdir -p "$STASHDIR"
monkeysphere-authentication gpg-cmd --import
mkdir -p "$STASHDIR"