Merge remote-tracking branch 'raphael/exclude-dist' into merge

* raphael/exclude-dist:
  Exclude all of dist/ from the first stage

Signed-off-by: Joerg Jaspert <joerg@debian.org>

2 files changed, 2 insertions, 2 deletions

diff --git a/bin/ftpsync b/bin/ftpsync
index 1ae7b81..7fdd9b3 100755
--- a/bin/ftpsync
+++ b/bin/ftpsync
@@ -283,7 +283,7 @@ RSYNC_BW=${RSYNC_BW:-0}
 # Default rsync options for *every* rsync call
 RSYNC_OPTIONS=${RSYNC_OPTIONS:-"-prltvHSB8192 --timeout 3600 --stats ${RSYNC_FILTER}"}
 # Options we only use in the first pass, where we do not want packages/sources to fly in yet and don't want to delete files
-RSYNC_OPTIONS1=${RSYNC_OPTIONS1:-"--exclude Packages* --exclude Sources* --exclude Release* --exclude InRelease --exclude ls-lR*"}
+RSYNC_OPTIONS1=${RSYNC_OPTIONS1:-"--include 'installer-*/**/*' --include '*/' --exclude 'dists/**/*' --exclude ls-lR*"}
 # Options for the second pass, where we do want everything, including deletion of old and now unused files
 RSYNC_OPTIONS2=${RSYNC_OPTIONS2:-"--max-delete=40000 --delay-updates --delete --delete-after --delete-excluded"}
 # Which rsync share to use on our upstream mirror?
diff --git a/etc/ftpsync.conf.sample b/etc/ftpsync.conf.sample
index e3fcc63..7d915e0 100644
--- a/etc/ftpsync.conf.sample
+++ b/etc/ftpsync.conf.sample
@@ -113,7 +113,7 @@
 
 ## Options the first pass gets. We do not want the Packages/Source indices
 ## here, and we also do not want to delete any files yet.
-#RSYNC_OPTIONS1="--exclude Packages* --exclude Sources* --exclude Release* --exclude InRelease --exclude ls-lR*"
+#RSYNC_OPTIONS1="--include 'installer-*/**/*' --include '*/' --exclude 'dists/**/*' --exclude ls-lR*"
 
 ## Options the second pass gets. Now we want the Packages/Source indices too
 ## and we also want to delete files. We also want to delete files that are