Update RemoteUpload to return a set Update if failed_uploads to check deeper

prebuilt.py

 #!/usr/bin/python
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import datetime
 import multiprocessing
 import optparse
 import os
 import re
@@ skipping 194 matching lines @@
 def RemoteUpload(files, pool=10):
   """Upload to google storage.
 
   Create a pool of process and call _GsUpload with the proper arguments.
 
   Args:
     files: dictionary with keys to local files and values to remote path.
     pool: integer of maximum proesses to have at the same time.
 
   Returns:
-    Return a list of tuple arguments of the failed uploads
+    Return a set of tuple arguments of the failed uploads
   """
   # TODO(scottz) port this to use _RunManyParallel when it is available in
   # cros_build_lib
   pool = multiprocessing.Pool(processes=pool)
   workers = []
   for local_file, remote_path in files.iteritems():
     workers.append((local_file, remote_path))
 
   result = pool.map_async(_GsUpload, workers, chunksize=1)
   while True:
     try:
-      return result.get(60*60)
+      return set(result.get(60*60))
     except multiprocessing.TimeoutError:
       pass
 
 
 def GenerateUploadDict(local_path, gs_path, strip_str):
   """Build a dictionary of local remote file key pairs for gsutil to upload.
 
   Args:
     local_path: A path to the file on the local hard drive.
     gs_path: Path to upload in Google Storage.
@@ skipping 38 matching lines @@
     package_path = os.path.join(board_path, 'packages')
     package_string = board
     strip_pattern = board_path
     gs_path = os.path.join(bucket, _GS_BOARD_PATH % {'board': board,
                                                      'version': version})
 
   upload_files = GenerateUploadDict(package_path, gs_path, strip_pattern)
 
   print 'Uploading %s' % package_string
   failed_uploads = RemoteUpload(upload_files)
-  if failed_uploads:
-    raise UploadFailed('Error uploading:\n%s' % '\n'.join(failed_uploads))
+  if len(failed_uploads) > 1 or (None not in failed_uploads):
+    error_msg = ['%s -> %s\n' % args for args in failed_uploads]
+    raise UploadFailed('Error uploading:\n%s' % error_msg)
 
   if git_file:
     RevGitFile(git_file, package_string, version)
 
 
 def usage(parser, msg):
   """Display usage message and parser help then exit with 1."""
   print >> sys.stderr, msg
   parser.print_help()
   sys.exit(1)
@@ skipping 37 matching lines @@
   if options.sync_host:
     UploadPrebuilt(options.build_path, options.upload, git_file=git_file)
 
   if options.board:
     UploadPrebuilt(options.build_path, options.upload, board=options.board,
                    git_file=git_file)
 
 
 if __name__ == '__main__':
   main()