add patch to ignore rdiff minor version levels

diff --git a/AUTHORS b/AUTHORS
index fad2bbb7f9e20b33958e401eef03e69c18e0b987..541e949f6de9f08bd34769e82bc1a2a9590ae67e 100644 (file)
--- 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
 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 <ressu@ressukka.net>
\ No newline at end of file

diff --git a/ChangeLog b/ChangeLog
index 1bcac309207fbf73bebc9c99b477096a82f03ae9..50e47606e7943eef7802edada56253d272f8ef4c 100644 (file)
--- 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)
        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
        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 52637cd42ee2eb2b7c8ab5313762735d3a8c1bab..46cae4981d0277e980d2b6671e32481e2aba4d67 100644 (file)
--- 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"
        # 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'"
        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
 }
 
        fi
 }