From: cbarratt <cbarratt>
Date: Tue, 11 Feb 2003 08:10:29 +0000 (+0000)
Subject:  - another rsync bug fix
X-Git-Tag: v2_0_0beta0~2
X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=commitdiff_plain;h=affa34c1c6e653829af8285cdc73c541cab5bf40

 - another rsync bug fix
---

diff --git a/lib/BackupPC/Xfer/Rsync.pm b/lib/BackupPC/Xfer/Rsync.pm
index ee14c36..c98ac8a 100644
--- a/lib/BackupPC/Xfer/Rsync.pm
+++ b/lib/BackupPC/Xfer/Rsync.pm
@@ -228,6 +228,7 @@ sub start
         # transferred, even though it is a full dump.
         #
 	$rsyncArgs = $conf->{RsyncArgs};
+	$rsyncArgs = [@$rsyncArgs, @fileList] if ( @fileList );
         $rsyncArgs = [@$rsyncArgs, "--ignore-times"]
                                     if ( $t->{type} eq "full" );
 	$rsyncClientCmd = $conf->{RsyncClientCmd};
diff --git a/lib/BackupPC/Xfer/RsyncFileIO.pm b/lib/BackupPC/Xfer/RsyncFileIO.pm
index 10ee772..f75fbbb 100644
--- a/lib/BackupPC/Xfer/RsyncFileIO.pm
+++ b/lib/BackupPC/Xfer/RsyncFileIO.pm
@@ -754,7 +754,7 @@ sub fileDeltaRxNext
 	my $lastBlk = $fio->{rxMatchNext} - 1;
         $fio->log("$fio->{rxFile}{name}: writing blocks $fio->{rxMatchBlk}.."
                   . "$lastBlk")
-                        if ( $fio->{logLevel} >= 10 );
+                        if ( $fio->{logLevel} >= 9 );
         my $seekPosn = $fio->{rxMatchBlk} * $fio->{rxBlkSize};
         if ( defined($fio->{rxInFd}) && !seek($fio->{rxInFd}, $seekPosn, 0) ) {
             $fio->log("Unable to seek $attr->{fullPath} to $seekPosn");
@@ -772,6 +772,7 @@ sub fileDeltaRxNext
             }
             if ( defined($fio->{rxInData}) ) {
                 $data = substr($fio->{rxInData}, $seekPosn, $len);
+		$seekPosn += $len;
             } else {
                 if ( sysread($fio->{rxInFd}, $data, $len) != $len ) {
                     $fio->log("Unable to read $len bytes from"
@@ -799,7 +800,7 @@ sub fileDeltaRxNext
         #
         my $len = length($newData);
         $fio->log("$fio->{rxFile}{name}: writing $len bytes new data")
-                        if ( $fio->{logLevel} >= 10 );
+                        if ( $fio->{logLevel} >= 9 );
         $fio->{rxOutFd}->write(\$newData);
         $fio->{rxDigest}->add($newData);
 	$fio->{rxSize} += length($newData);