summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Jaspert <joerg@debian.org>2012-05-21 21:52:12 +0200
committerJoerg Jaspert <joerg@debian.org>2012-05-21 21:52:12 +0200
commit7beebda2b078cdf6c999b7dc812c96f8d6462724 (patch)
treedb56ad4e63eea7f24cb8e7a5e683f3d692ebbd07
parentc48f6f882ea6f137c4f84ffcd93a678c62312ede (diff)
Revert "Exclude all of dist/ from the first stage"
This reverts commit 2cb884ddc8eec3b620fd369c250958273feb0e01. Signed-off-by: Joerg Jaspert <joerg@debian.org>
-rwxr-xr-xbin/ftpsync2
-rw-r--r--etc/ftpsync.conf.sample2
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/ftpsync b/bin/ftpsync
index ab774aa..3cbb49f 100755
--- a/bin/ftpsync
+++ b/bin/ftpsync
@@ -293,7 +293,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:-"--include 'installer-*/**/*' --include '*/' --exclude 'dists/**/*' --exclude ls-lR*"}
+RSYNC_OPTIONS1=${RSYNC_OPTIONS1:-"--exclude Packages* --exclude Sources* --exclude Release* --exclude InRelease --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 6b16cc8..d6e21d9 100644
--- a/etc/ftpsync.conf.sample
+++ b/etc/ftpsync.conf.sample
@@ -134,7 +134,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="--include 'installer-*/**/*' --include '*/' --exclude 'dists/**/*' --exclude ls-lR*"
+#RSYNC_OPTIONS1="--exclude Packages* --exclude Sources* --exclude Release* --exclude InRelease --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