bug 468124 - upload.py should let UPLOAD_PORT and POST_UPLOAD_CMD actually be optional. r=bsmedberg

build/upload.py

@@ -170,12 +170,15 @@ if __name__ == '__main__':
     host = RequireEnvironmentVariable('UPLOAD_HOST')
     user = RequireEnvironmentVariable('UPLOAD_USER')
     path = RequireEnvironmentVariable('UPLOAD_PATH')
-    port = int(OptionalEnvironmentVariable('UPLOAD_PORT'))
+    port = OptionalEnvironmentVariable('UPLOAD_PORT')
+    if port is not None:
+        port = int(port)
     key = OptionalEnvironmentVariable('UPLOAD_SSH_KEY')
     post_upload_command = OptionalEnvironmentVariable('POST_UPLOAD_CMD')
     if sys.platform == 'win32':
         path = FixupMsysPath(path)
-        post_upload_command = FixupMsysPath(post_upload_command)
+        if post_upload_command is not None:
+            post_upload_command = FixupMsysPath(post_upload_command)
 
     parser = OptionParser(usage="usage: %prog [options] <files>")
     parser.add_option("-b", "--base-path",