1.1 --- a/support/buildbot/package.pl Tue Oct 05 19:56:20 2010 -0700
1.2 +++ b/support/buildbot/package.pl Thu Oct 14 18:14:45 2010 -0500
1.3 @@ -67,33 +67,25 @@
1.4 my ($major,$minor) = ($version =~ /^(\d+)\.(\d+)/);
1.5 $ftp_path .= "/$major.$minor";
1.6
1.7 -if ($^O eq "darwin")
1.8 -{
1.9 - # Horrible workaround for weird upload failure
1.10 - system("ftp -Vu ftp://$ftp_user:$ftp_pass\@$ftp_host/$ftp_path/$filename $filename");
1.11 -}
1.12 -else
1.13 -{
1.14 - my ($ftp);
1.15 +my ($ftp);
1.16
1.17 - $ftp = Net::FTP->new($ftp_host, Debug => 0)
1.18 - or die "Cannot connect to host $ftp_host: $@";
1.19 +$ftp = Net::FTP->new($ftp_host, Debug => 0)
1.20 + or die "Cannot connect to host $ftp_host: $@";
1.21 +
1.22 +$ftp->login($ftp_user, $ftp_pass)
1.23 + or die "Cannot connect to host $ftp_host as $ftp_user: " . $ftp->message . "\n";
1.24
1.25 - $ftp->login($ftp_user, $ftp_pass)
1.26 - or die "Cannot connect to host $ftp_host as $ftp_user: " . $ftp->message . "\n";
1.27 +if ($ftp_path ne '')
1.28 +{
1.29 + $ftp->cwd($ftp_path)
1.30 + or die "Cannot change to folder $ftp_path: " . $ftp->message . "\n";
1.31 +}
1.32
1.33 - if ($ftp_path ne '')
1.34 - {
1.35 - $ftp->cwd($ftp_path)
1.36 - or die "Cannot change to folder $ftp_path: " . $ftp->message . "\n";
1.37 - }
1.38 +$ftp->binary();
1.39 +$ftp->put($filename)
1.40 + or die "Cannot drop file $filename ($ftp_path): " . $ftp->message . "\n";
1.41
1.42 - $ftp->binary();
1.43 - $ftp->put($filename)
1.44 - or die "Cannot drop file $filename ($ftp_path): " . $ftp->message . "\n";
1.45 -
1.46 - $ftp->close();
1.47 -}
1.48 +$ftp->close();
1.49
1.50 print "File sent to drop site as $filename -- build succeeded.\n";
1.51