diff options
| author | Joerg Jaspert <joerg@debian.org> | 2012-05-21 21:52:04 +0200 |
|---|---|---|
| committer | Joerg Jaspert <joerg@debian.org> | 2012-05-21 21:52:04 +0200 |
| commit | c48f6f882ea6f137c4f84ffcd93a678c62312ede (patch) | |
| tree | a60e502c390f9fbf4133eccd54fb878cf06b74d5 | |
| parent | 578af22aec511b10b432b1e39d3f9d1ce7e810b8 (diff) | |
Revert "Quote rsync patterns to avoid accidental expansion by the shell"
This reverts commit 3cb5f405310bac2c2f21fdfde8e9d22372b1e284.
Signed-off-by: Joerg Jaspert <joerg@debian.org>
| -rwxr-xr-x | bin/ftpsync | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/ftpsync b/bin/ftpsync index 2adeb2d..ab774aa 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:-"--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? @@ -348,10 +348,10 @@ SOURCE_EXCLUDE=${SOURCE_EXCLUDE:-""} ARCH_EXCLUDE=${ARCH_EXCLUDE:-""} # Exclude architectures defined in $ARCH_EXCLUDE for ARCH in ${ARCH_EXCLUDE}; do - EXCLUDE="${EXCLUDE} --exclude binary-${ARCH}/ --exclude installer-${ARCH}/ --exclude Contents-${ARCH}.gz --exclude Contents-${ARCH}.bz2 --exclude Contents-${ARCH}.diff/ --exclude arch-${ARCH}.files --exclude arch-${ARCH}.list.gz --exclude \"*_${ARCH}.deb\" --exclude \"*_${ARCH}.udeb\" --exclude \"*_${ARCH}.changes\"" + EXCLUDE="${EXCLUDE} --exclude binary-${ARCH}/ --exclude installer-${ARCH}/ --exclude Contents-${ARCH}.gz --exclude Contents-${ARCH}.bz2 --exclude Contents-${ARCH}.diff/ --exclude arch-${ARCH}.files --exclude arch-${ARCH}.list.gz --exclude *_${ARCH}.deb --exclude *_${ARCH}.udeb --exclude *_${ARCH}.changes" if [ "${ARCH}" = "source" ]; then if [ -z ${SOURCE_EXCLUDE} ]; then - SOURCE_EXCLUDE=" --exclude source/ --exclude '*.tar.gz' --exclude '*.diff.gz' --exclude '*.tar.bz2' --exclude '*.tar.xz' -exclude '*.diff.bz2' --exclude '*.dsc' " + SOURCE_EXCLUDE=" --exclude source/ --exclude *.tar.gz --exclude *.diff.gz --exclude *.tar.bz2 --exclude *.tar.xz -exclude *.diff.bz2 --exclude *.dsc " fi fi done |