X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fmh%2Fadd_revoker;h=dfce4e11f1a64b4b4c46e1d93f73531d5eda94df;hb=88b19565bced6d9ec9b035d1f9fe51ce6567923b;hp=b6affbb77873242143137920d88aa5f9aabf0a9a;hpb=ffe5855c75320bf35b6db1770b4ecbd0012723e8;p=monkeysphere.git

diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
index b6affbb..dfce4e1 100644
--- a/src/share/mh/add_revoker
+++ b/src/share/mh/add_revoker
@@ -57,10 +57,10 @@ else
 
     # download the key from the keyserver as the monkeysphere user
     su_monkeysphere_user \
-	"GNUPGHOME=$TMPLOC gpg --keyserver $KEYSERVER --recv-key 0x${keyID}!"
+	"GNUPGHOME=$TMPLOC gpg --quiet --keyserver $KEYSERVER --recv-key 0x${keyID}!"
 
     # export the new key to the host keyring
-    su_monkeysphere_user "GNUPGHOME=$TMPLOC gpg --export 0x${keyID}!" \
+    su_monkeysphere_user "GNUPGHOME=$TMPLOC gpg --quiet --export 0x${keyID}!" \
 	| gpg_host --import
 fi
 
@@ -77,10 +77,14 @@ fi
 log info "key found:"
 gpg_host --fingerprint "0x${fingerprint}!"
 
-echo "Are you sure you want to add the above key as a"
-read -p "revoker of the host key? (y/N) " OK; OK=${OK:-N}
-if [ "${OK/y/Y}" != 'Y' ] ; then
-    failure "Revoker not added."
+if [ "$PROMPT" = "true" ] ; then
+    echo "Are you sure you want to add the above key as a"
+    read -p "revoker of the host key? (y/N) " OK; OK=${OK:-N}
+    if [ "${OK/y/Y}" != 'Y' ] ; then
+	failure "revoker not added."
+    fi
+else
+    log debug "adding revoker without prompting."
 fi
 
 # edit-key script to add revoker
@@ -97,6 +101,8 @@ failure "not implemented yet!"
 if echo "$addrevokerCommand" | \
     gpg_core_edit ; then
 
+    update_gpg_pub_file
+
     log info "Revoker added."
 else
     failure "Problem adding revoker."