projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Added multi-level incrementals. Still needs testing.
[BackupPC.git]
/
lib
/
BackupPC
/
Xfer
/
Rsync.pm
diff --git
a/lib/BackupPC/Xfer/Rsync.pm
b/lib/BackupPC/Xfer/Rsync.pm
index
9612cab
..
80d47a6
100644
(file)
--- 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.
#
#
# See http://backuppc.sourceforge.net.
#
@@
-55,9
+55,10
@@
BEGIN {
#
# Note: also update configure.pl when this version number is changed!
#
#
# Note: also update configure.pl when this version number is changed!
#
- if ( $File::RsyncP::VERSION < 0.5
1
) {
+ if ( $File::RsyncP::VERSION < 0.5
2
) {
$RsyncLibOK = 0;
$RsyncLibOK = 0;
- $RsyncLibErr = "File::RsyncP module version too old: need 0.50";
+ $RsyncLibErr = "File::RsyncP module version"
+ . " ($File::RsyncP::VERSION) too old: need 0.52";
} else {
$RsyncLibOK = 1;
}
} else {
$RsyncLibOK = 1;
}
@@
-219,8
+220,9
@@
sub start
$logMsg = "full backup started for directory $t->{shareName}";
}
} else {
$logMsg = "full backup started for directory $t->{shareName}";
}
} else {
- $incrDate = $bpc->timeStamp($t->{lastFull} - 3600, 1);
- $logMsg = "incr backup started back to $incrDate for directory"
+ $incrDate = $bpc->timeStamp($t->{incrBaseTime}, 1);
+ $logMsg = "incr backup started back to $incrDate"
+ . " (backup #$t->{incrBaseBkupNum}) for directory"
. " $t->{shareName}";
}
. " $t->{shareName}";
}
@@
-238,10
+240,13
@@
sub start
$rsyncClientCmd = $conf->{RsyncClientCmd};
$argList = ['--server', '--sender', @$rsyncArgs,
'.', $t->{shareNameSlash}];
$rsyncClientCmd = $conf->{RsyncClientCmd};
$argList = ['--server', '--sender', @$rsyncArgs,
'.', $t->{shareNameSlash}];
+ eval {
+ $argList = File::RsyncP->excludeStrip($argList);
+ };
$fioArgs = {
client => $t->{client},
share => $t->{shareName},
$fioArgs = {
client => $t->{client},
share => $t->{shareName},
- viewNum => $t->{
lastFull
BkupNum},
+ viewNum => $t->{
incrBase
BkupNum},
partialNum => $t->{partialNum},
};
}
partialNum => $t->{partialNum},
};
}
@@
-299,6
+304,7
@@
sub start
pidHandler => sub {
$t->{pidHandler}(@_);
},
pidHandler => sub {
$t->{pidHandler}(@_);
},
+ clientCharset => $conf->{ClientCharset},
fio => BackupPC::Xfer::RsyncFileIO->new({
xfer => $t,
bpc => $t->{bpc},
fio => BackupPC::Xfer::RsyncFileIO->new({
xfer => $t,
bpc => $t->{bpc},
@@
-312,6
+318,7
@@
sub start
$t->{XferLOG}->write(\$str);
},
cacheCheckProb => $conf->{RsyncCsumCacheVerifyProb},
$t->{XferLOG}->write(\$str);
},
cacheCheckProb => $conf->{RsyncCsumCacheVerifyProb},
+ clientCharset => $conf->{ClientCharset},
%$fioArgs,
}),
});
%$fioArgs,
}),
});