Merge branch 'distorted' into vampire

* distorted:
  etc/ftpsync-debian-security.conf: No updates for `oldstable'.
  bin/ftpsync: `-exclude' means something completely wrong.

diff --git a/bin/ftpsync b/bin/ftpsync
index 1ae7b81..292b992 100755 (executable)
--- a/bin/ftpsync
+++ b/bin/ftpsync
@@ -337,7 +337,7 @@ 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"
     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

diff --git a/etc/ftpsync-debian-security.conf b/etc/ftpsync-debian-security.conf
index 17aaf8d..7069fa8 100644 (file)
--- a/etc/ftpsync-debian-security.conf
+++ b/etc/ftpsync-debian-security.conf
@@ -5,7 +5,7 @@
 LABEL=debian-security
 RSYNC_HOST=security.debian.org
 SEARCH_DISTS=$(
-       for i in oldstable stable testing; do
+       for i in stable testing; do
          echo $i/updates
        done
 )