From e3454782c54d3beb93b6f14d6ac4cf7ef8cd5645 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Sat, 28 Jul 2007 11:36:40 +0000 Subject: [PATCH] add patch to ignore rdiff minor version levels --- AUTHORS | 3 ++- ChangeLog | 1 + handlers/rdiff | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/AUTHORS b/AUTHORS index fad2bbb..541e949 100644 --- a/AUTHORS +++ b/AUTHORS @@ -21,4 +21,5 @@ garcondumonde@riseup.net Martin Krafft madduck@debian.org -- admingroup patch Anarcat -- lotsa patches Jamie McClelland -- cstream patches -ale -- ldap cleanup \ No newline at end of file +ale -- ldap cleanup +Sami Haahtinen \ No newline at end of file diff --git a/ChangeLog b/ChangeLog index 1bcac30..50e4760 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ version 0.9.5 -- unreleased rdiff: . Added cstream support to allow for bandwidth limiting . Handle "keep = yes" to disable old backups removal (Closes: #424633) + . Ignore rdiff-backup minor versions (thanks Sami Haahtinen) rub . Fixed typo in rub handler that caused it to not work . Changed to use lib/vserver code diff --git a/handlers/rdiff b/handlers/rdiff index 52637cd..46cae49 100644 --- a/handlers/rdiff +++ b/handlers/rdiff @@ -32,12 +32,12 @@ function get_version() { # if user or host is missing, returns the local version. if [ "$#" -lt 2 ]; then debug "$RDIFFBACKUP -V" - echo `$RDIFFBACKUP -V` + echo `$RDIFFBACKUP -V | cut -d. -f1,2` else 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"` + echo `ssh $sshoptions $host -l $user "$RDIFFBACKUP -V | grep rdiff-backup | cut -d. -f1,2"` fi }