[NaCl SDK] Refactor sdk_update*.

native_client_sdk/src/build_tools/buildbot_common.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.
 
 """Common utilities for all buildbot scripts that specifically don't rely
 on having a full chromium checkout.
 """
 
 import os
 import subprocess
@@ skipping 31 matching lines @@
 
 def BuildStep(name):
   """Annotate a buildbot build step."""
   sys.stdout.flush()
   print '\n@@@BUILD_STEP %s@@@' % name
   sys.stdout.flush()
 
 
 def Run(args, cwd=None, env=None, shell=False):
   """Start a process with the provided arguments.
-  
+
   Starts a process in the provided directory given the provided arguments. If
   shell is not False, the process is launched via the shell to provide shell
   interpretation of the arguments.  Shell behavior can differ between platforms
   so this should be avoided when not using platform dependent shell scripts."""
   print 'Running: ' + ' '.join(args)
   sys.stdout.flush()
   sys.stderr.flush()
   subprocess.check_call(args, cwd=cwd, env=env, shell=shell)
   sys.stdout.flush()
   sys.stderr.flush()
 
 
 def CopyDir(src, dst, excludes=('.svn', '*/.svn')):
   """Recursively copy a directory using."""
   args = ['-r', src, dst]
   for exc in excludes:
     args.append('--exclude=' + exc)
   print 'cp -r %s %s' % (src, dst)
   if os.path.abspath(src) == os.path.abspath(dst):
     ErrorExit('ERROR: Copying directory onto itself: ' + src)
   oshelpers.Copy(args)
 
 
 def CopyFile(src, dst):
-  print 'cp -r %s %s' % (src, dst)
+  print 'cp %s %s' % (src, dst)
   if os.path.abspath(src) == os.path.abspath(dst):
     ErrorExit('ERROR: Copying file onto itself: ' + src)
   args = [src, dst]
   oshelpers.Copy(args)
 
 
 def RemoveDir(dst):
   """Remove the provided path."""
   print 'rm -fr ' + dst
   oshelpers.Remove(['-fr', dst])
@@ skipping 34 matching lines @@
 
   subprocess.check_call(
       '%s cp -a public-read %s %s' % (GetGsutil(), filename, full_dst),
       shell=True,
       cwd=cwd)
   url = 'https://commondatastorage.googleapis.com/'\
         '%s/%s' % (bucket_path, filename)
   if step_link:
     print '@@@STEP_LINK@download@%s@@@' % url
     sys.stdout.flush()