Merge "dist: copy dir allow dir to already exist & don't copy permissions"
diff --git a/dist/dist.py b/dist/dist.py
index c6d3f13..39d3c12 100644
--- a/dist/dist.py
+++ b/dist/dist.py
@@ -72,7 +72,7 @@
             shutil.copyfile(src_abspath, dst, follow_symlinks=True)
         elif os.path.isdir(src):
             print("[dist] Copying dir: %s" % dst)
-            shutil.copytree(src_abspath, dst)
+            shutil.copytree(src_abspath, dst, copy_function=shutil.copyfile, dirs_exist_ok=True)
 
     for archive in archives:
         try: