projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Commit for 2.1.0.
[BackupPC.git]
/
bin
/
BackupPC_restore
diff --git
a/bin/BackupPC_restore
b/bin/BackupPC_restore
index
5843a01
..
5389e7d
100755
(executable)
--- a/
bin/BackupPC_restore
+++ b/
bin/BackupPC_restore
@@
-29,7
+29,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.
#
@@
-611,9
+611,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,
@@
-629,7
+629,7
@@
sub UserCommandRun
stat => \%stat,
xferOK => $stat{xferOK} || 0,
hostError => $stat{hostError},
stat => \%stat,
xferOK => $stat{xferOK} || 0,
hostError => $stat{hostError},
- type =>
$type
,
+ type =>
"restore"
,
bkupSrcHost => $RestoreReq{hostSrc},
bkupSrcShare => $RestoreReq{shareSrc},
bkupSrcNum => $RestoreReq{num},
bkupSrcHost => $RestoreReq{hostSrc},
bkupSrcShare => $RestoreReq{shareSrc},
bkupSrcNum => $RestoreReq{num},
@@
-637,9
+637,10
@@
sub UserCommandRun
pathHdrSrc => $RestoreReq{pathHdrSrc},
pathHdrDest => $RestoreReq{pathHdrDest},
fileList => $RestoreReq{fileList},
pathHdrSrc => $RestoreReq{pathHdrSrc},
pathHdrDest => $RestoreReq{pathHdrDest},
fileList => $RestoreReq{fileList},
+ cmdType => $cmdType,
};
};
- my $cmd = $bpc->cmdVarSubstitute($Conf{$
t
ype}, $vars);
- $RestoreLOG->write(\"Executing $
t
ype: @$cmd\n");
+ my $cmd = $bpc->cmdVarSubstitute($Conf{$
cmdT
ype}, $vars);
+ $RestoreLOG->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