Francois Gouget : testbot/TestAgent: Fix GetFile()'s error handling.
Alexandre Julliard
julliard at winehq.org
Mon Feb 25 14:02:21 CST 2013
Module: tools
Branch: master
Commit: 00c73ead8962dc69ec1e02a69633c70362c5dfef
URL: http://source.winehq.org/git/tools.git/?a=commit;h=00c73ead8962dc69ec1e02a69633c70362c5dfef
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Mon Feb 25 16:53:03 2013 +0100
testbot/TestAgent: Fix GetFile()'s error handling.
---
testbot/lib/WineTestBot/TestAgent.pm | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm
index f06bd71..7852e41 100644
--- a/testbot/lib/WineTestBot/TestAgent.pm
+++ b/testbot/lib/WineTestBot/TestAgent.pm
@@ -287,7 +287,7 @@ sub _RecvEntryHeader($)
return ($Type, $High << 32 | $Low);
}
-sub _ExpectEntryHeader($$$)
+sub _ExpectEntryHeader($$;$)
{
my ($self, $Type, $Size) = @_;
@@ -368,7 +368,7 @@ sub _RecvFile($$$)
return undef if (!defined $self->{fd});
debug(" RecvFile($Filename)\n");
- my $Size = $self->_RecvEntryHeader('d');
+ my $Size = $self->_ExpectEntryHeader('d');
return undef if (!defined $Size);
my $Success;
@@ -988,6 +988,7 @@ sub GetFile($$$)
{
my $Success = $self->_GetFileOrString($ServerPathName, $LocalPathName, $fh);
close($fh);
+ unlink $LocalPathName if (!$Success);
return $Success;
}
$self->_SetError($ERROR, "Unable to open '$LocalPathName' for writing: $!");
More information about the wine-cvs
mailing list