X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FXfer%2FRsync.pm;h=8972a98f887c6a34d77e646ce76c9eae3148fce8;hp=a920a67c7643751c94cb3106cba37e5fd7d9de3b;hb=5b3e6091d542c2e7445d5dd511cdf6e20aec8b8d;hpb=d13d57e035dac9362ca393991b978530402969b7

diff --git a/lib/BackupPC/Xfer/Rsync.pm b/lib/BackupPC/Xfer/Rsync.pm
index a920a67..8972a98 100644
--- a/lib/BackupPC/Xfer/Rsync.pm
+++ b/lib/BackupPC/Xfer/Rsync.pm
@@ -29,7 +29,7 @@
 #
 #========================================================================
 #
-# Version 2.1.0, released 20 Jun 2004.
+# Version 3.0.0alpha, released 23 Jan 2006.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -239,7 +239,9 @@ sub start
 	$rsyncClientCmd = $conf->{RsyncClientCmd};
         $argList = ['--server', '--sender', @$rsyncArgs,
                               '.', $t->{shareNameSlash}];
-	$argList = File::RsyncP->excludeStrip($argList);
+	eval {
+	    $argList = File::RsyncP->excludeStrip($argList);
+	};
 	$fioArgs = {
 	    client     => $t->{client},
 	    share      => $t->{shareName},
@@ -301,6 +303,7 @@ sub start
 	pidHandler   => sub {
 			    $t->{pidHandler}(@_);
 			},
+        clientCharset => $conf->{ClientCharset},
 	fio          => BackupPC::Xfer::RsyncFileIO->new({
 			    xfer       => $t,
 			    bpc        => $t->{bpc},
@@ -314,6 +317,7 @@ sub start
 					      $t->{XferLOG}->write(\$str);
 					  },
 			    cacheCheckProb => $conf->{RsyncCsumCacheVerifyProb},
+                            clientCharset  => $conf->{ClientCharset},
 			    %$fioArgs,
 		      }),
     });