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

build/toolchain/mac/copy_bundle_data.py

Index: build/toolchain/mac/copy_bundle_data.py
diff --git a/build/toolchain/mac/copy_bundle_data.py b/build/toolchain/mac/copy_bundle_data.py
index 976591c08ee309a1df86d71d3bd6ce66d3865edc..1ca72d067e662008ea8186ad40ac06f1eab4820b 100644
--- a/build/toolchain/mac/copy_bundle_data.py
+++ b/build/toolchain/mac/copy_bundle_data.py
@@ -3,9 +3,11 @@
 # found in the LICENSE file.
 
 import argparse
+import errno
 import os
 import shutil
 import sys
+import subprocess
 
 
 def detect_encoding(data, default_encoding='UTF-8'):
@@ -64,25 +66,24 @@ def copy_file(source, dest):
     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
+  try:
+    shutil.rmtree(dest)
+  except OSError as e:
+    if e.errno == errno.ENOENT:
+      pass
+    elif e.errno == errno.ENOTDIR:
+      os.unlink(dest)
+    else:
+      raise
 
-  if os.path.exists(dest):
-    os.unlink(dest)
 
   _, extension = os.path.splitext(source)
   if extension == '.strings':
     copy_strings_file(source, dest)
     return
 
-  shutil.copy(source, dest)
+  subprocess.check_call(
+      ['rsync', '--recursive', '--perms', '--links', source, dest])

[Dirk Pranke, 2016/06/15 22:11:40]

I'm not sure if this'll do the right thing.

If you want to copy a directory, won't rsync do two different things based on
what exactly the arguments are (whether there is a trailing slash for a
directory name) and whether the destination directory already exists?

[Robert Sesek, 2016/06/15 22:31:16]

Good catch. Will strip the trailing slash(es) on the source, but it doesn't
affect the destination. Also, the destination is always going to be removed (see
above).

 
 
 def main():