[Monotone-commits-diffs] net.venge.monotone.contrib.usher: 79d24db216149f6d4a9c62d5d16c27d44f91344d

[code]

revision:            79d24db216149f6d4a9c62d5d16c27d44f91344d
date:                2011-04-27T07:56:24
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.contrib.usher
changelog:
* utils/usherctl.in: If the usherctl config file given on the command
  line isn't readable, abort.  If the default usherctl config file isn't
  readable, don't try to read it.

manifest:
format_version "1"

new_manifest [4d25775af4eb4d445afd6081f8e9410cfc9dd01c]

old_revision [40fbdb3fc287c60945393daeacd291bfc7476bb4]

patch "utils/usherctl.in"
 from [5349323a31abcbce752c8b6428a0a88e55734ffa]
   to [974b76606f422a2c03cdcde8ff4e781730a82b6f]
============================================================
--- utils/usherctl.in	5349323a31abcbce752c8b6428a0a88e55734ffa
+++ utils/usherctl.in	974b76606f422a2c03cdcde8ff4e781730a82b6f
@@ -59,6 +59,9 @@ while true; do
 	-c )
 	    if [ -r "$2" ]; then
 		config_file="$2"
+	    else
+		echo >&2 "No readable file '$config_file'... aborting"
+		exit 1
 	    fi
 	    shift 2
 	    ;;
@@ -73,7 +76,10 @@ done
 # a file name, shell will try to find it along $PATH instead of the current
 # working directory.  Since dirname will at least output a '.', this construct
 # does the right thing.
-. "`dirname $config_file`/`basename $config_file`"
+config_file="`dirname $config_file`/`basename $config_file`"
+if [ -r "$config_file" ]; then
+    . "$config_file"
+fi
 
 # Apply default where nothing is set.
 USHER_CONFDIR=${USHER_CONFDIR:address@hidden@/usher}