summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJameson Rollins <jrollins@finestructure.net>2010-10-04 01:49:47 -0400
committerJameson Rollins <jrollins@finestructure.net>2010-10-04 01:49:47 -0400
commit85e74d854ffd6ab826bd2d5a285bf30a2755dcef (patch)
treeccf2cbb4cd39402833b98b8679c5405212d7e2b3
parentd3c00de6d06a49ae54b74f39c667cfab39940266 (diff)
use LC_ALL=C for all gpg calls
This should help with internationalization differences in gpg that could cause problems. Works in tests as is, but haven't tested with odd locales.
-rw-r--r--Changelog4
-rwxr-xr-xsrc/monkeysphere2
-rwxr-xr-xsrc/monkeysphere-host2
3 files changed, 5 insertions, 3 deletions
diff --git a/Changelog b/Changelog
index 27a5328..cf43180 100644
--- a/Changelog
+++ b/Changelog
@@ -5,6 +5,8 @@ monkeysphere (0.32~pre) unstable; urgency=low
(closes MS #2491)
* Fix need for single argument to gpg_sphere (thanks Clint)
(closes MS #442)
+ * specify LC_ALL=C for all gpg calls
+ (closes MS #2496)
[ Micah Anderson ]
* fix monkeysphere-host revoke-key, which never worked properly :(
@@ -14,7 +16,7 @@ monkeysphere (0.32~pre) unstable; urgency=low
[ Clint Adams ]
* add support for options to the authorized User IDs file. Options that
should apply to keys for a given User ID should be on
- whitespace-prefixed lines immediately following that User ID.
+ whitespace-prefixed lines immediately following that User ID.
(closes MS #440)
-- Jameson Rollins <jrollins@finestructure.net> Mon, 04 Oct 2010 00:36:08 -0400
diff --git a/src/monkeysphere b/src/monkeysphere
index 1cfafb6..674114a 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -62,7 +62,7 @@ EOF
# user gpg command to define common options
gpg_user() {
- gpg --no-greeting --quiet --no-tty "$@"
+ LC_ALL=C gpg --no-greeting --quiet --no-tty "$@"
}
# output the ssh fingerprint of a gpg key
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 17f918c..ff56e98 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -71,7 +71,7 @@ EOF
# function to interact with the gpg keyring
gpg_host() {
- GNUPGHOME="$GNUPGHOME_HOST" gpg --no-auto-check-trustdb --trust-model=always --no-greeting --quiet --no-tty "$@"
+ GNUPGHOME="$GNUPGHOME_HOST" LC_ALL=C gpg --no-auto-check-trustdb --trust-model=always --no-greeting --quiet --no-tty "$@"
}
# list the info about the a key, in colon format, to stdout