[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[dak/master] Don't rsync symlinks from foreign hosts



---
 config/debian/dinstall.functions  | 6 +++---
 config/debian/unchecked.functions | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index eee39e2..34f238a 100755
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -101,7 +101,7 @@ function i18n1() {
     log "Synchronizing i18n package descriptions"
     # First sync their newest data
     cd ${scriptdir}/i18nsync
-    rsync -aq --delete --delete-after ddtp-sync:/does/not/matter . || true
+    rsync -rtq --safe-links --chmod=F644,D755 --delete --delete-after ddtp-sync:/does/not/matter . || true
 
     # Now check if we still know about the packages for which they created the files
     # is the timestamp signed by us?
@@ -142,7 +142,7 @@ function dep11() {
     local dep11dir="${scriptdir}/dep11"
     mkdir -p ${dep11dir}
     cd ${dep11dir}
-    rsync -aq --delete --delete-after dep11-sync:/does/not/matter . || true
+    rsync -rtq --safe-links --chmod=F644,D755 --delete --delete-after dep11-sync:/does/not/matter . || true
 
     # Lets check!
     if ${scriptsdir}/dep11-basic-validate.py . ${dep11dir}/; then
@@ -152,7 +152,7 @@ function dep11() {
                 for comp in main contrib non-free; do
                     mkdir -p ${ftpdir}/dists/${dir}/${comp}/dep11
                     cd ${dir}/${comp}
-                    rsync -aq --delete --delete-after --exclude by-hash --exclude "./*.tmp" . ${ftpdir}/dists/${dir}/${comp}/dep11/.
+                    rsync -rtq --delete --delete-after --exclude by-hash --exclude "./*.tmp" . ${ftpdir}/dists/${dir}/${comp}/dep11/.
                     cd ${dep11dir}
                 done
             fi
diff --git a/config/debian/unchecked.functions b/config/debian/unchecked.functions
index 5302621..a67f0f8 100644
--- a/config/debian/unchecked.functions
+++ b/config/debian/unchecked.functions
@@ -17,5 +17,5 @@ function fetchqueuedpackages() {
     # Sync new uploaded packages from the central upload queue host.
     log "Sync new uploads from upload queues"
     cd ${unchecked}
-    rsync -aq --remove-source-files upload-master:/does/not/matter . || true
+    rsync -rtq --safe-links --chmod=F640,D755 --remove-source-files upload-master:/does/not/matter . || true
 }
-- 
2.1.4


Reply to: