some tweaks to output formatting for diagnostic command.

[monkeysphere.git] / src / common

diff --git a/src/common b/src/common
index b57b721bee797d6ad7b21cd9daaf93d42b08555c..e281de4eae92bb22132995ca17ac26cf0b6b0252 100644 (file)
--- a/src/common
+++ b/src/common
@@ -319,8 +319,6 @@ process_user_id() {
     fi
 
     # loop over all lines in the gpg output and process.
-    # need to do it this way (as opposed to "while read...") so that
-    # variables set in loop will be visible outside of loop
     echo "$gpgOut" | cut -d: -f1,2,5,10,12 | \
     while IFS=: read -r type validity keyid uidfpr usage ; do
        # process based on record type
@@ -563,6 +561,11 @@ process_known_hosts() {
 
     hosts=$(meat "$KNOWN_HOSTS" | cut -d ' ' -f 1 | grep -v '^|.*$' | tr , ' ' | tr '\n' ' ')
 
+    if [ -z "$hosts" ] ; then
+       log "no hosts to process."
+       return
+    fi
+
     # take all the hosts from the known_hosts file (first
     # field), grep out all the hashed hosts (lines starting
     # with '|')...
@@ -697,6 +700,11 @@ process_authorized_user_ids() {
 
     log "processing authorized_user_ids file..."
 
+    if ! meat "$authorizedUserIDs" ; then
+       log "no user IDs to process."
+       return
+    fi
+
     nline=0
 
     # extract user IDs from authorized_user_ids file