From: Jameson Rollins <jrollins@finestructure.net>
Date: Mon, 18 Jan 2010 17:05:37 +0000 (-0500)
Subject: Merge remote branch 'dkg/master'
X-Git-Tag: monkeysphere_0.28~26
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=ce693e829f05de90a4054bdd5d17480d9e6564ab;hp=5447172bbbf2b5ec662f24a8582199123c44d100

Merge remote branch 'dkg/master'
---

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index eadd74b..da37618 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -101,7 +101,7 @@ update_gpg_pub_file() {
 }
 
 host_fingerprints() {
-    local fprs=($(cat "$HOST_KEY_FPR_FILE"))
+    local fprs=($(cat "$HOST_KEY_FPR_FILE" 2>/dev/null))
 
     log debug "host key fingerprints:"
     printf '%s\n' "${fprs[@]}" | log debug