testbot: Don't try to dereference $TunnelDefaults if it is undefined.
Francois Gouget
fgouget at codeweavers.com
Mon Dec 17 09:10:23 CST 2012
---
testbot/lib/WineTestBot/VMs.pm | 2 +-
testbot/scripts/TestAgent | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm
index 510c66a..cbd4fb6 100644
--- a/testbot/lib/WineTestBot/VMs.pm
+++ b/testbot/lib/WineTestBot/VMs.pm
@@ -374,7 +374,7 @@ sub GetAgent($)
{
my $ParsedURI = URI->new($URI);
- %$TunnelInfo = %$TunnelDefaults;
+ %$TunnelInfo = %$TunnelDefaults if ($TunnelDefaults);
$TunnelInfo->{sshhost} = $ParsedURI->host;
$TunnelInfo->{sshport} = $ParsedURI->port;
$TunnelInfo->{username} = $ParsedURI->userinfo;
diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent
index 7f4258b..2d3f663 100755
--- a/testbot/scripts/TestAgent
+++ b/testbot/scripts/TestAgent
@@ -249,7 +249,7 @@ my $TunnelInfo;
if ($TunnelOpt and $TunnelOpt =~ /^ssh:/)
{
my $ParsedURI = URI->new($TunnelOpt);
- %$TunnelInfo = %$TunnelDefaults;
+ %$TunnelInfo = %$TunnelDefaults if ($TunnelDefaults);
$TunnelInfo->{sshhost} = $ParsedURI->host;
$TunnelInfo->{sshport} = $ParsedURI->port;
$TunnelInfo->{username} = $ParsedURI->userinfo;
--
1.7.10.4
More information about the wine-patches
mailing list