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