[Mac/iOS/GN] Use rsync in copy_bundle_data instead of shutil.copytree.

build/toolchain/mac/copy_bundle_data.py

 # Copyright 2016 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.
 
 import argparse
+import errno
 import os
 import shutil
 import sys
+import subprocess
 
 
 def DetectEncoding(data, default_encoding='UTF-8'):
   """Detects the encoding used by |data| from the Byte-Order-Mark if present.
 
   Args:
     data: string whose encoding needs to be detected
     default_encoding: encoding returned if no BOM is found.
 
   Returns:
@@ skipping 54 matching lines @@
       dest_file.write(data)
 
 
 def CopyFile(source, dest, strings_format):
   """Copies a file or directory from |source| to |dest|.
 
   Args:
     source: string, path to the source file
     dest: string, path to the destination file
   """
-  if os.path.isdir(source):
-    if os.path.exists(dest):
-      shutil.rmtree(dest)
-    # Copy tree.
-    # TODO(thakis): This copies file attributes like mtime, while the
-    # single-file branch below doesn't. This should probably be changed to
-    # be consistent with the single-file branch.
-    shutil.copytree(source, dest, symlinks=True)
-    return
-
-  if os.path.exists(dest):
-    os.unlink(dest)
+  try:
+    shutil.rmtree(dest)
+  except OSError as e:
+    if e.errno == errno.ENOENT:
+      pass
+    elif e.errno == errno.ENOTDIR:
+      os.unlink(dest)
+    else:
+      raise
 
   _, extension = os.path.splitext(source)
   if extension == '.strings':
     CopyStringsFile(source, dest, strings_format)
     return
 
-  shutil.copy(source, dest)
+  # Strip trailing slashes on the source so rsync copies the source as a
+  # directory.
+  source = source.rstrip('/')
+
+  subprocess.check_call(

[sdefresne, 2016/06/17 17:17:28]

I'm not sure this is correct, see my (long) comment on
https://codereview.chromium.org/2076853003/.

[Robert Sesek, 2016/06/17 23:11:26]

It was not correct. I mixed up how the destination was specified and so did the
inverse of the right thing in response to Dirk's comment on the original review
(https://codereview.chromium.org/2075463002/).

I added documentation to the top of the file to make it more clear in the
future.

+      ['rsync', '--recursive', '--perms', '--links', source, dest])
 
 
 def Main():
   parser = argparse.ArgumentParser(
       description='copy source to destination for the creation of a bundle')
   parser.add_argument('--strings-format',
       choices=('xml1', 'binary1', 'legacy'), default='legacy',
       help='convert .strings file to format (default: %(default)s)')
   parser.add_argument('source', help='path to source file or directory')
   parser.add_argument('dest', help='path to destination')
   args = parser.parse_args()
 
   CopyFile(args.source, args.dest, args.strings_format)
 
 if __name__ == '__main__':
   sys.exit(Main())