diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | handlers/rdiff.in | 8 |
3 files changed, 9 insertions, 1 deletions
@@ -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 @@ -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 } |