From 3a66dc83ce480439cbd4d77da191465cbd3fc11c Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Wed, 9 Mar 2016 13:17:47 -0800
Subject: [PATCH] update_distfiles: use gsutil rsync instead of cp

---
 update_distfiles | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/update_distfiles b/update_distfiles
index 4bcc56e487..d497fda49c 100755
--- a/update_distfiles
+++ b/update_distfiles
@@ -68,10 +68,11 @@ upload_mirror() {
     local remote_mirror="${UPLOAD_ROOT}/$repo_name"
 
     info "Uploading public distfiles for $repo_name"
-    gsutil ${GSUTIL_OPTS} cp -n \
-        "${local_mirror}/distfiles/*" "${remote_mirror}/distfiles"
+    gsutil ${GSUTIL_OPTS} rsync -c \
+        "${local_mirror}/distfiles/" "${remote_mirror}/distfiles"
 
     info "Uploading private metadata for $repo_name"
+    # uses cp instead of rsync in order to provide acl
     gsutil ${GSUTIL_OPTS} cp -a project-private \
         "${local_mirror}/info/*" "${remote_mirror}/info"
 }
@@ -82,11 +83,12 @@ download_mirror() {
 
     info "Downloading public distfiles for $repo_name"
     mkdir -p "${local_mirror}/"{distfiles,info}
-    gsutil ${GSUTIL_OPTS} cp -n \
-        "${remote_mirror}/distfiles/*" "${local_mirror}/distfiles"
+    gsutil ${GSUTIL_OPTS} rsync -c -d \
+        "${remote_mirror}/distfiles/" "${local_mirror}/distfiles"
 
     info "Downloading private metadata for $repo_name"
-    gsutil ${GSUTIL_OPTS} cp "${remote_mirror}/info/*" "${local_mirror}/info"
+    gsutil ${GSUTIL_OPTS} rsync -c -d \
+        "${remote_mirror}/info/" "${local_mirror}/info"
 }
 
 if [[ ${FLAGS_download} -eq ${FLAGS_TRUE} ]]; then