projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* removed Host_or_User_name from lang files
[BackupPC.git]
/
lib
/
BackupPC
/
Xfer
/
Rsync.pm
diff --git
a/lib/BackupPC/Xfer/Rsync.pm
b/lib/BackupPC/Xfer/Rsync.pm
index
f0350c9
..
107e2e1
100644
(file)
--- a/
lib/BackupPC/Xfer/Rsync.pm
+++ b/
lib/BackupPC/Xfer/Rsync.pm
@@
-11,7
+11,7
@@
# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
-# Copyright (C) 2002 Craig Barratt
+# Copyright (C) 2002
-2003
Craig Barratt
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-29,7
+29,7
@@
#
#========================================================================
#
#
#========================================================================
#
-# Version 2.
0.0beta3, released 1 Jun
2003.
+# Version 2.
1.0_CVS, released 3 Jul
2003.
#
# See http://backuppc.sourceforge.net.
#
#
# See http://backuppc.sourceforge.net.
#
@@
-52,9
+52,9
@@
BEGIN {
$RsyncLibOK = 0;
$RsyncLibErr = "File::RsyncP module doesn't exist";
} else {
$RsyncLibOK = 0;
$RsyncLibErr = "File::RsyncP module doesn't exist";
} else {
- if ( $File::RsyncP::VERSION < 0.4
1
) {
+ if ( $File::RsyncP::VERSION < 0.4
4
) {
$RsyncLibOK = 0;
$RsyncLibOK = 0;
- $RsyncLibErr = "File::RsyncP module version too old: need 0.4
1
";
+ $RsyncLibErr = "File::RsyncP module version too old: need 0.4
4
";
} else {
$RsyncLibOK = 1;
}
} else {
$RsyncLibOK = 1;
}
@@
-176,8
+176,17
@@
sub start
# To make this easier we do all the includes first and all
# of the excludes at the end (hopefully they commute).
#
# To make this easier we do all the includes first and all
# of the excludes at the end (hopefully they commute).
#
+ $file =~ s{/$}{};
$file = "/$file";
$file =~ s{//+}{/}g;
$file = "/$file";
$file =~ s{//+}{/}g;
+ if ( $file eq "/" ) {
+ #
+ # This is a special case: if the user specifies
+ # "/" then just include it and don't exclude "/*".
+ #
+ push(@inc, $file) if ( !$incDone{$file} );
+ next;
+ }
my $f = "";
while ( $file =~ m{^/([^/]*)(.*)} ) {
my $elt = $1;
my $f = "";
while ( $file =~ m{^/([^/]*)(.*)} ) {
my $elt = $1;
@@
-215,7
+224,7
@@
sub start
if ( $t->{type} eq "full" ) {
$logMsg = "full backup started for directory $t->{shareName}";
} else {
if ( $t->{type} eq "full" ) {
$logMsg = "full backup started for directory $t->{shareName}";
} else {
- $incrDate = $bpc->timeStamp
ISO
($t->{lastFull} - 3600, 1);
+ $incrDate = $bpc->timeStamp($t->{lastFull} - 3600, 1);
$logMsg = "incr backup started back to $incrDate for directory"
. " $t->{shareName}";
}
$logMsg = "incr backup started back to $incrDate for directory"
. " $t->{shareName}";
}