Merge trunk r745:746 into 1.3 and 1.4

This commit is contained in:
Nick Bolton 2010-09-10 14:32:16 +00:00
parent e93c892459
commit dee247959a
1 changed files with 4 additions and 3 deletions

View File

@ -429,9 +429,10 @@ class InternalCommands:
if not ftp:
raise Exception('FTP info not defined.')
name = self.dist_name(type)
print 'Uploading %s to FTP server %s...' % (name, ftp.host)
ftp.run('bin/' + name, self.dist_name_rev(type))
src = self.dist_name(type)
dest = self.dist_name_rev(type)
print 'Uploading %s to FTP server %s...' % (dest, ftp.host)
ftp.run('bin/' + src, dest)
print 'Done'
def dist_name(self, type):