debian: Use --delete-delay instead of --delete-after in pass 2 as per ftpsync

[sipb-mirrors.git] / fetch-scripts / debian

diff --git a/fetch-scripts/debian b/fetch-scripts/debian
index 6c6ad4b6e5adb4f5372679d684458baf128b9566..98506ff7710c8e45a919d13dcf04ada22f0b1f59 100644 (file)
--- a/fetch-scripts/debian
+++ b/fetch-scripts/debian
@@ -9,14 +9,14 @@ set -u
 BASEDIR=${MIRRORDIR}/debian
 RSYNCSOURCE=rsync://debian.gtisc.gatech.edu/debian
 
-RSYNC_OPTS="--recursive --links --hard-links --times --sparse --hard-links --block-size=8192 --timeout 3600 --perms"
+RSYNC_OPTS="--recursive --safe-links --times --sparse --timeout 3600 --perms"
 #OTHER_OPTS="--verbose --stats --dry-run"
 OTHER_OPTS="--verbose --stats"
 
 # Options we only use in the first pass, where we do not want packages/sources to fly in yet and dont want to delete files
-PASS1=(--exclude Packages\* --exclude Sources\* --exclude Release\* --exclude InRelease --exclude i18n/\* --exclude ls-lR\* --exclude Translation\*)
+PASS1=(--include \*.diff --exclude \*.diff/Index --exclude Packages\* --exclude Sources\* --exclude Release\* --exclude InRelease --include i18n/by-hash --exclude i18n/\* --exclude ls-lR\* --exclude Translation\*)
 # Options for the second pass, where we do want everything, including deletion of old and now unused files
-PASS2="--max-delete=40000 --delay-updates --delete --delete-after --delete-excluded --exclude \"project/trace/${HOSTNAME}\""
+PASS2="--max-delete=40000 --delay-updates --delete --delete-delay --delete-excluded --exclude \"project/trace/${HOSTNAME}\""
 
 # The temp directory used by rsync --delay-updates is not
 # world-readable remotely. Always exclude it to avoid errors.