From: Matt Goins <mjgoins@openflows.com>
Date: Tue, 10 Mar 2009 13:33:09 +0000 (-0400)
Subject: Merge commit 'jrollins/master'
X-Git-Tag: monkeysphere_0.25~33
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=b8c187a0803442fbf4d9c432cac90925791171aa;hp=-c

Merge commit 'jrollins/master'
---

b8c187a0803442fbf4d9c432cac90925791171aa
diff --combined src/monkeysphere-host
index 6136399,da7fc9c..507b47f
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@@ -103,7 -103,7 +103,7 @@@ update_gpg_pub_file() 
  load_fingerprint() {
      if [ -f "$HOST_KEY_FILE" ] ; then
  	HOST_FINGERPRINT=$( \
 -	    (FUBAR=$(mktemp -d) && export GNUPGHOME="$FUBAR" \
 +	    (FUBAR=$(msmktempdir) && export GNUPGHOME="$FUBAR" \
  	    && gpg --quiet --import \
  	    && gpg --quiet --list-keys --with-colons --with-fingerprint \
  	    && rm -rf "$FUBAR") <"$HOST_KEY_FILE" \
@@@ -242,6 -242,7 +242,7 @@@ export PROMP
  export GNUPGHOME_HOST
  export GNUPGHOME
  export HOST_FINGERPRINT
+ export LOG_PREFIX
  
  # get subcommand
  COMMAND="$1"