Merge branch 'distorted' into vampire

* distorted:
  etc/ftpsync-debian-security.conf: Don't ask for unstable or experimental.
  etc/ftpsync-common.conf: Include Debian sources.

diff --git a/etc/ftpsync-common.conf b/etc/ftpsync-common.conf
index 5ca0c35..de669b9 100644 (file)
--- a/etc/ftpsync-common.conf
+++ b/etc/ftpsync-common.conf
@@ -83,7 +83,6 @@
 ## want.  Crazy, no?
 ARCH_EXCLUDE=$(
        bin/debian-excludes $RSYNC_HOST $RSYNC_PATH $WANT_ARCH $SEARCH_DISTS
-       echo source
 )
 
 ## Do we have leaf mirror to signal we are done and they should sync?

diff --git a/etc/ftpsync-debian-security.conf b/etc/ftpsync-debian-security.conf
index a6b47fb..17aaf8d 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 unstable experimental; do
+       for i in oldstable stable testing; do
          echo $i/updates
        done
 )