From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Mon, 18 Jan 2010 22:14:04 +0000 (-0500)
Subject: renaming m-h update_gpg_pub_file to update_pgp_pub_file
X-Git-Tag: monkeysphere_0.28~22
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=9307f58b4fdf8e139c4fd5de5c3a878b8b12d0b1

renaming m-h update_gpg_pub_file to update_pgp_pub_file
---

diff --git a/src/share/mh/add_name b/src/share/mh/add_name
index b5922db..0eeefb7 100644
--- a/src/share/mh/add_name
+++ b/src/share/mh/add_name
@@ -54,7 +54,7 @@ if PEM2OPENPGP_USAGE_FLAGS=authenticate \
 
     gpg_host --check-trustdb
 
-    update_gpg_pub_file
+    update_pgp_pub_file
 
     show_key "$keyID"
 
diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
index 264c255..41cf090 100644
--- a/src/share/mh/add_revoker
+++ b/src/share/mh/add_revoker
@@ -120,7 +120,7 @@ save
 log debug "executing add revoker script..."
 if echo "$addrevokerCommand" | gpg_host_edit "0x${keyID}!" ; then
 
-    update_gpg_pub_file
+    update_pgp_pub_file
 
     log info "Revoker added."
 else
diff --git a/src/share/mh/diagnostics b/src/share/mh/diagnostics
index b92d729..8e83cc5 100644
--- a/src/share/mh/diagnostics
+++ b/src/share/mh/diagnostics
@@ -33,7 +33,7 @@ if ! [ -d "$SYSDATADIR" ] ; then
 fi
 
 if ! [ -f "$HOST_KEY_FILE" ] ; then
-    echo "No host key gpg pub file found!"
+    echo "No host key OpenPGP pub file found!"
     echo " - Recommendation: run 'monkeysphere-host import-key'"
     exit
 fi
diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index fea3d27..1b6f267 100644
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -50,8 +50,8 @@ else
 	| gpg_host --import
 fi
 
-# export to gpg public key to file
-update_gpg_pub_file
+# export to OpenPGP public key to file
+update_pgp_pub_file
 
 log info "host key imported:"
 
diff --git a/src/share/mh/revoke_name b/src/share/mh/revoke_name
index d080704..7788327 100644
--- a/src/share/mh/revoke_name
+++ b/src/share/mh/revoke_name
@@ -58,7 +58,7 @@ if (cat "$GNUPGHOME_HOST/secring.gpg" && gpg_host --export "$keyID") \
 
     gpg_host --check-trustdb
 
-    update_gpg_pub_file
+    update_pgp_pub_file
 
     show_key "$keyID"
 
diff --git a/src/share/mh/set_expire b/src/share/mh/set_expire
index 049c2c5..be3f6bb 100644
--- a/src/share/mh/set_expire
+++ b/src/share/mh/set_expire
@@ -53,7 +53,7 @@ $extendBy
 save
 EOF
 
-update_gpg_pub_file
+update_pgp_pub_file
 
 log info <<EOF
 NOTE: Key expiration date adjusted, but not yet published.