diff -r a60f226c5c92 -r f76a4eb5ee58 support/buildbot/package.pl --- a/support/buildbot/package.pl Fri May 14 03:12:12 2010 -0500 +++ b/support/buildbot/package.pl Sat May 15 18:31:36 2010 -0500 @@ -67,25 +67,33 @@ my ($major,$minor) = ($version =~ /^(\d+)\.(\d+)/); $ftp_path .= "/$major.$minor"; -my ($ftp); - -$ftp = Net::FTP->new($ftp_host, Debug => 0) - or die "Cannot connect to host $ftp_host: $@"; - -$ftp->login($ftp_user, $ftp_pass) - or die "Cannot connect to host $ftp_host as $ftp_user: " . $ftp->message . "\n"; - -if ($ftp_path ne '') +if ($^O eq "darwin") +{ + # Horrible workaround for weird upload failure + system("ftp -Vu ftp://$ftp_user:$ftp_pass\@$ftp_host/$ftp_path/$filename $filename"); +} +else { - $ftp->cwd($ftp_path) - or die "Cannot change to folder $ftp_path: " . $ftp->message . "\n"; -} + my ($ftp); + + $ftp = Net::FTP->new($ftp_host, Debug => 0) + or die "Cannot connect to host $ftp_host: $@"; + + $ftp->login($ftp_user, $ftp_pass) + or die "Cannot connect to host $ftp_host as $ftp_user: " . $ftp->message . "\n"; -$ftp->binary(); -$ftp->put($filename) - or die "Cannot drop file $filename ($ftp_path): " . $ftp->message . "\n"; + if ($ftp_path ne '') + { + $ftp->cwd($ftp_path) + or die "Cannot change to folder $ftp_path: " . $ftp->message . "\n"; + } -$ftp->close(); + $ftp->binary(); + $ftp->put($filename) + or die "Cannot drop file $filename ($ftp_path): " . $ftp->message . "\n"; + + $ftp->close(); +} print "File sent to drop site as $filename -- build succeeded.\n";