From: intrigeri <intrigeri@boum.org>
Date: Sat, 9 Jan 2010 22:25:03 +0000 (+0100)
Subject: rdiff: fix confusing error if rdiff-backup cannot be found on remote server.
X-Git-Tag: backupninja-0.9.7~5
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=46eccf2fd0c894790405b2e3aae8dfb99f5a5d98;p=matthijs%2Fupstream%2Fbackupninja.git

rdiff: fix confusing error if rdiff-backup cannot be found on remote server.

Thanks to maniacmartin <martin@maniacmartin.com> for the patch on which this one
is based.
This closes Redmine bug #1209.
---

diff --git a/AUTHORS b/AUTHORS
index c8686eb..07d55c0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -32,3 +32,4 @@ Tuomas Jormola <tj@solitudo.net> -- "when = manual" option
 Ian Beckwith <ianb@erislabs.net> -- dup bandwidthlimit fix
 Olivier Berger <oberger@ouvaton.org> -- dup debug output bugfix, reportinfo option
 stefan <s.freudenberg@jpberlin.de> -- dup support for Amazon S3 buckets
+maniacmartin <martin@maniacmartin.com> -- rdiff confusing error message fix
diff --git a/ChangeLog b/ChangeLog
index f4009d7..b1e140b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,7 @@ version 0.9.7 -- UNRELEASED
 	   reported as such.
 	rdiff:
 	 . Fix include/exclude paths with spaces (Closes: #398435)
+	 . Fix confusing error if rdiff-backup cannot be found on remote server.
 	sys:
 	 . New luksheaders option (default=disabled) to backup the Luks header
 	   of every Luks device.
diff --git a/handlers/rdiff.in b/handlers/rdiff.in
index 98a53a3..60386fa 100644
--- a/handlers/rdiff.in
+++ b/handlers/rdiff.in
@@ -31,6 +31,7 @@ function get_version() {
    # given no arguments, returns the local version.
    # given a user and host, returns the remote version.
    # if user or host is missing, returns the local version.
+   local version
    if [ "$#" -lt 2 ]; then
       debug "$RDIFFBACKUP -V"
       echo `$RDIFFBACKUP -V`
@@ -38,7 +39,12 @@ function get_version() {
       local user=$1
       local host=$2
       debug "ssh $sshoptions $host -l $user '$RDIFFBACKUP -V'"
-      echo `ssh $sshoptions $host -l $user "$RDIFFBACKUP -V | grep rdiff-backup"`
+      version=`ssh $sshoptions $host -l $user "$RDIFFBACKUP -V"`
+      if [ $? = 127 ]; then
+         fatal "Unable to execute rdiff-backup on remote server. It probably isn't installed"
+      else
+         echo "$version" | grep rdiff-backup
+      fi
    fi
 }