Upload retry summary to desired location instead of uploading then moving.

scripts/slave/slave_utils.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Functions specific to build slaves, shared by several buildbot scripts.
 """
 
 import datetime
 import glob
 import os
@@ skipping 370 matching lines @@
   return '%s-%s' % (provider_prefix, name)
 
 
 def GSUtilCopy(source, dest, mimetype=None, gs_acl=None, cache_control=None,
                metadata=None, override_gsutil=None):
   """Copy a file to Google Storage.
 
   Runs the following command:
     gsutil -h Content-Type:<mimetype> \
            -h Cache-Control:<cache_control> \
-        cp -a <gs_acl> file://<filename> <gs_base>/<subdir>/<filename w/o path>
+        cp -a <gs_acl> file://<filename> <dest>
 
   Args:
     source: the source URI
     dest: the destination URI
     mimetype: optional value to add as a Content-Type header
     gs_acl: optional value to add as a canned-acl
     cache_control: optional value to set Cache-Control header
     metadata: (dict) A dictionary of string key/value metadata entries to set
         (see `gsutil cp' '-h' option)
     override_gsutil (list): optional argv to run gsutil
+
   Returns:
     The status code returned from running the generated gsutil command.
   """
 
   if not source.startswith('gs://') and not source.startswith('file://'):
     source = 'file://' + source
   if not dest.startswith('gs://') and not dest.startswith('file://'):
     dest = 'file://' + dest
   # The setup also sets up some env variables - for now always run that.
   gsutil = GSUtilSetup()
@@ skipping 12 matching lines @@
     param = (field) if v is None else ('%s:%s' % (field, v))
     command += ['-h', param]
   command.extend(['cp'])
   if gs_acl:
     command.extend(['-a', gs_acl])
   command.extend([source, dest])
   return chromium_utils.RunCommand(command)
 
 
 def GSUtilCopyFile(filename, gs_base, subdir=None, mimetype=None, gs_acl=None,
-                   cache_control=None, metadata=None, override_gsutil=None):
+                   cache_control=None, metadata=None, override_gsutil=None,
+                   dest_filename=None):
   """Copy a file to Google Storage.
 
   Runs the following command:
     gsutil -h Content-Type:<mimetype> \
         -h Cache-Control:<cache_control> \
-        cp -a <gs_acl> file://<filename> <gs_base>/<subdir>/<filename w/o path>
+        cp -a <gs_acl> file://<filename> <gs_base>/<subdir>/<dest_filename>
 
   Args:
     filename: the file to upload
     gs_base: the bucket to upload the file to
     subdir: optional subdirectory withing the bucket
     mimetype: optional value to add as a Content-Type header
     gs_acl: optional value to add as a canned-acl
     override_gsutil (list): optional argv to run gsutil
+    dest_filename: optional destination filename; if not specified, then the
+        destination filename will be the source filename without the path
+
   Returns:
     The status code returned from running the generated gsutil command.
   """
 
   source = 'file://' + filename
   dest = gs_base
   if subdir:
     # HACK(nsylvain): We can't use normpath here because it will break the
     # slashes on Windows.
     if subdir == '..':
       dest = os.path.dirname(gs_base)
     else:
       dest = '/'.join([gs_base, subdir])
-  dest = '/'.join([dest, os.path.basename(filename)])
+  if dest_filename is None:
+    dest_filename = os.path.basename(filename)
+  dest = '/'.join([dest, dest_filename])
   return GSUtilCopy(source, dest, mimetype, gs_acl, cache_control,
                     metadata=metadata, override_gsutil=override_gsutil)
 
 
 def GSUtilCopyDir(src_dir, gs_base, dest_dir=None, gs_acl=None,
                   cache_control=None):
   """Upload the directory and its contents to Google Storage."""
 
   if os.path.isfile(src_dir):
     assert os.path.isdir(src_dir), '%s must be a directory' % src_dir
@@ skipping 432 matching lines @@
     dir_path: The directory path to be tested.
 
   Returns:
     True if given directory is in a git repository, False otherwise.
   """
   git_exe = 'git.bat' if sys.platform.startswith('win') else 'git'
   with open(os.devnull, 'w') as devnull:
     p = subprocess.Popen([git_exe, 'rev-parse', '--git-dir'],
                          cwd=dir_path, stdout=devnull, stderr=devnull)
     return p.wait() == 0