Mirrors/backupninja
1
0
Fork 0
mirror of https://0xacab.org/liberate/backupninja.git synced 2024-11-26 12:42:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Thanks to maniacmartin <martin@maniacmartin.com> for the patch on which this one
is based.
This closes Redmine bug #1209.
This commit is contained in:
intrigeri 2010-01-09 23:25:03 +01:00
parent 64c4d190a3
commit 46eccf2fd0
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -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

1
ChangeLog
View File

@ -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.

8
handlers/rdiff.in
View File

@ -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
}