Bug 563008 - fix upload.py on python2.4. r=ted
authorChris AtLee <catlee@mozilla.com>
Fri, 30 Apr 2010 14:54:51 -0400
changeset 41917 08cfc20700a23341586e625c821c8d298ef6cae1
parent 41916 a8ba788cac1840006fd025dbf1b87f747d4de11a
child 41918 510669ff9ba1d9e25c0d131b8c2618e978312134
push idunknown
push userunknown
push dateunknown
reviewersted
bugs563008
milestone1.9.3a5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
Bug 563008 - fix upload.py on python2.4. r=ted
build/upload.py
--- a/build/upload.py
+++ b/build/upload.py
@@ -174,19 +174,16 @@ def UploadFiles(user, host, path, files,
                 print "Uploading " + file
             DoSCPFile(file, remote_path, user, host, port=port, ssh_key=ssh_key)
             remote_files.append(remote_path + '/' + os.path.basename(file))
         if post_upload_command is not None:
             if verbose:
                 print "Running post-upload command: " + post_upload_command
             file_list = '"' + '" "'.join(remote_files) + '"'
             DoSSHCommand('%s "%s" %s' % (post_upload_command, path, file_list), user, host, port=port, ssh_key=ssh_key)
-    except:
-        print "Encountered error while uploading"
-        raise
     finally:
         if upload_to_temp_dir:
             DoSSHCommand("rm -rf %s" % path, user, host, port=port,
                          ssh_key=ssh_key)
     if verbose:
         print "Upload complete"
 
 if __name__ == '__main__':