#
#========================================================================
#
-# Version 3.0.0beta0, released 11 Jul 2006.
+# Version 3.0.0, released 28 Jan 2007.
#
# See http://backuppc.sourceforge.net.
#
use BackupPC::Xfer::Tar;
use BackupPC::Xfer::Rsync;
use BackupPC::Xfer::BackupPCd;
+use Encode;
use Socket;
use File::Path;
use File::Find;
for my $shareName ( @$ShareNames ) {
local(*RH, *WH);
+ #
+ # Convert $shareName to utf8 octets
+ #
+ $shareName = encode("utf8", $shareName);
$stat{xferOK} = $stat{hostAbort} = undef;
$stat{hostError} = $stat{lastOutputLine} = undef;
if ( -d "$Dir/new/$shareName" ) {
$stat{xferOK} = 0 if ( $stat{hostError} || $stat{hostAbort} );
if ( !$stat{xferOK} ) {
#
- # kill off the tranfer program, first nicely then forcefully
+ # kill off the transfer program, first nicely then forcefully
#
if ( @xferPid ) {
kill($bpc->sigName2num("INT"), @xferPid);
"Aborting backup up after signal $sigName\n");
#
- # Tell xfer to abort
+ # Tell xfer to abort, but only if we actually started one
#
- $xfer->abort($reason);
+ $xfer->abort($reason) if ( defined($xfer) );
#
# Send ALRMs to BackupPC_tarExtract if we are using it
$Backups[$i]{mangle} = 1; # name mangling always on for v1.04+
$Backups[$i]{xferMethod} = $Conf{XferMethod};
$Backups[$i]{charset} = $Conf{ClientCharset};
+ $Backups[$i]{version} = $bpc->Version();
#
# Save the main backups file
#