projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes for 2.1.0pl1:
[BackupPC.git]
/
bin
/
BackupPC_dump
diff --git
a/bin/BackupPC_dump
b/bin/BackupPC_dump
index
b974172
..
c37e239
100755
(executable)
--- a/
bin/BackupPC_dump
+++ b/
bin/BackupPC_dump
@@
-70,7
+70,7
@@
#
#========================================================================
#
#
#========================================================================
#
-# Version 2.1.0
beta2, released 23 May
2004.
+# Version 2.1.0
, released 20 Jun
2004.
#
# See http://backuppc.sourceforge.net.
#
#
# See http://backuppc.sourceforge.net.
#
@@
-348,7
+348,7
@@
if ( !$opts{i} && !$opts{f} && $Conf{BlackoutGoodCnt} >= 0
}
if ( !$opts{i} && !$opts{f} && $StatusHost{backoffTime} > time ) {
}
if ( !$opts{i} && !$opts{f} && $StatusHost{backoffTime} > time ) {
- printf(LOG "%sskipping because of user requested delay (%.1f hours left)",
+ printf(LOG "%sskipping because of user requested delay (%.1f hours left)
\n
",
$bpc->timeStamp, ($StatusHost{backoffTime} - time) / 3600);
NothingToDo($needLink);
}
$bpc->timeStamp, ($StatusHost{backoffTime} - time) / 3600);
NothingToDo($needLink);
}
@@
-1108,17
+1108,17
@@
sub BackupExpire
#
my $fullKeepCnt = $Conf{FullKeepCnt};
$fullKeepCnt = [$fullKeepCnt] if ( ref($fullKeepCnt) ne "ARRAY" );
#
my $fullKeepCnt = $Conf{FullKeepCnt};
$fullKeepCnt = [$fullKeepCnt] if ( ref($fullKeepCnt) ne "ARRAY" );
- my $
oldestFull
;
+ my $
fullAgeMax
;
my $fullPeriod = int(0.5 + $Conf{FullPeriod});
for ( my $i = 0 ; $i < @$fullKeepCnt ; $i++ ) {
my $fullPeriod = int(0.5 + $Conf{FullPeriod});
for ( my $i = 0 ; $i < @$fullKeepCnt ; $i++ ) {
- $
oldestFull
+= $fullKeepCnt->[$i] * $fullPeriod;
+ $
fullAgeMax
+= $fullKeepCnt->[$i] * $fullPeriod;
$fullPeriod *= 2;
}
$fullPeriod *= 2;
}
- $
oldestFull
+= $fullPeriod; # add some buffer
+ $
fullAgeMax
+= $fullPeriod; # add some buffer
if ( $cntFull > $Conf{FullKeepCntMin}
&& $oldestFull > $Conf{FullAgeMax}
if ( $cntFull > $Conf{FullKeepCntMin}
&& $oldestFull > $Conf{FullAgeMax}
- && $oldestFull > $
oldestFull
+ && $oldestFull > $
fullAgeMax
&& $Conf{FullKeepCntMin} > 0
&& $Conf{FullAgeMax} > 0
&& (@Backups <= $firstFull + 1
&& $Conf{FullKeepCntMin} > 0
&& $Conf{FullAgeMax} > 0
&& (@Backups <= $firstFull + 1
@@
-1384,9
+1384,9
@@
sub pidHandler
#
sub UserCommandRun
{
#
sub UserCommandRun
{
- my($
t
ype) = @_;
+ my($
cmdT
ype) = @_;
- return if ( !defined($Conf{$
t
ype}) );
+ return if ( !defined($Conf{$
cmdT
ype}) );
my $vars = {
xfer => $xfer,
client => $client,
my $vars = {
xfer => $xfer,
client => $client,
@@
-1404,9
+1404,10
@@
sub UserCommandRun
xferOK => $stat{xferOK} || 0,
hostError => $stat{hostError},
type => $type,
xferOK => $stat{xferOK} || 0,
hostError => $stat{hostError},
type => $type,
+ cmdType => $cmdType,
};
};
- my $cmd = $bpc->cmdVarSubstitute($Conf{$
t
ype}, $vars);
- $XferLOG->write(\"Executing $
t
ype: @$cmd\n");
+ my $cmd = $bpc->cmdVarSubstitute($Conf{$
cmdT
ype}, $vars);
+ $XferLOG->write(\"Executing $
cmdT
ype: @$cmd\n");
#
# Run the user's command, dumping the stdout/stderr into the
# Xfer log file. Also supply the optional $vars and %Conf in
#
# Run the user's command, dumping the stdout/stderr into the
# Xfer log file. Also supply the optional $vars and %Conf in