diff -r 778ba19ab327 -r 4c2e6bd4d2e8 support/buildbot/package.pl --- a/support/buildbot/package.pl Tue Oct 05 19:56:20 2010 -0700 +++ b/support/buildbot/package.pl Thu Oct 14 18:14:45 2010 -0500 @@ -67,33 +67,25 @@ my ($major,$minor) = ($version =~ /^(\d+)\.(\d+)/); $ftp_path .= "/$major.$minor"; -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 -{ - my ($ftp); +my ($ftp); - $ftp = Net::FTP->new($ftp_host, Debug => 0) - or die "Cannot connect to host $ftp_host: $@"; +$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->login($ftp_user, $ftp_pass) - or die "Cannot connect to host $ftp_host as $ftp_user: " . $ftp->message . "\n"; +if ($ftp_path ne '') +{ + $ftp->cwd($ftp_path) + or die "Cannot change to folder $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->binary(); +$ftp->put($filename) + or die "Cannot drop file $filename ($ftp_path): " . $ftp->message . "\n"; - $ftp->binary(); - $ftp->put($filename) - or die "Cannot drop file $filename ($ftp_path): " . $ftp->message . "\n"; - - $ftp->close(); -} +$ftp->close(); print "File sent to drop site as $filename -- build succeeded.\n";