From: Julien Cristau <jcristau@debian.org>
Date: Wed, 2 Mar 2016 22:29:46 +0000 (+0100)
Subject: schroot: squeeze cleanup
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=25355632b54fc6e788bea71b6b7e3afee6bc70b7;p=mirror%2Fdsa-puppet.git

schroot: squeeze cleanup

Signed-off-by: Julien Cristau <jcristau@debian.org>
---

diff --git a/modules/schroot/files/schroot-setup.d/99builddsourceslist b/modules/schroot/files/schroot-setup.d/99builddsourceslist
index 95a33d38e..bafff3ca9 100755
--- a/modules/schroot/files/schroot-setup.d/99builddsourceslist
+++ b/modules/schroot/files/schroot-setup.d/99builddsourceslist
@@ -144,24 +144,14 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
             SUITES="${SUITE_BASE}"
             [ -n "${debian_mirror}" ] && domirror "${debian_mirror} SUITE COMPONENT" ${APT_LIST}
             domirror "http://ftp.debian.org/debian SUITE COMPONENT" ${APT_LIST}
-            if [ "$SUITE" != "squeeze" ]; then
-                [ -n "${debian_mirror}" ] && domirror "${debian_mirror} SUITE-backports COMPONENT" ${APT_LIST}
-                domirror "http://ftp.debian.org/debian SUITE-backports COMPONENT" ${APT_LIST}
-            else
-                [ -n "${backports_mirror}" ] && domirror "${backports_mirror} SUITE COMPONENT" ${APT_LIST}
-                domirror "http://backports.debian.org/debian-backports/ SUITE-backports COMPONENT" ${APT_LIST}
-            fi
+            [ -n "${debian_mirror}" ] && domirror "${debian_mirror} SUITE-backports COMPONENT" ${APT_LIST}
+            domirror "http://ftp.debian.org/debian SUITE-backports COMPONENT" ${APT_LIST}
             if [ "${debian_incoming}" != 'no' ]; then
                 domirror "http://incoming.debian.org/debian-buildd buildd-SUITE-backports COMPONENT" ${APT_LIST}
             fi
             if [ "$(echo ${SUITE_VARIANT} | cut -d - -f 2)" = "sloppy" ]; then
-                if [ "$SUITE" != "squeeze" ]; then
-                    [ -n "${debian_mirror}" ] && domirror "${debian_mirror} SUITE-backports-sloppy COMPONENT" ${APT_LIST}
-                    domirror "http://ftp.debian.org/debian SUITE-backports-sloppy COMPONENT" ${APT_LIST}
-                else
-                    [ -n "${backports_mirror}" ] && domirror "${backports_mirror} SUITE-backports-sloppy COMPONENT" ${APT_LIST}
-                    domirror "http://backports.debian.org/debian-backports/ SUITE-backports-sloppy COMPONENT" ${APT_LIST}
-                fi
+                [ -n "${debian_mirror}" ] && domirror "${debian_mirror} SUITE-backports-sloppy COMPONENT" ${APT_LIST}
+                domirror "http://ftp.debian.org/debian SUITE-backports-sloppy COMPONENT" ${APT_LIST}
                 if [ "${debian_incoming}" != 'no' ]; then
                     domirror "http://incoming.debian.org/debian-buildd buildd-SUITE-backports-sloppy COMPONENT" ${APT_LIST}
                 fi
diff --git a/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources b/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
index 4eb150923..c87ecf4c6 100755
--- a/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
+++ b/modules/schroot/files/schroot-setup.d/99porterbox-extra-sources
@@ -81,16 +81,8 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
 
       case "${SUITE_VARIANT:-}" in
         backports)
-          case "${SUITE_BASE:-}" in
-            squeeze)
-              echo "deb     http://backports.debian.org/debian-backports/ ${suite_alias}-${SUITE_VARIANT} main" >> "$SRCL"
-              echo "deb-src http://backports.debian.org/debian-backports/ ${suite_alias}-${SUITE_VARIANT} main" >> "$SRCL"
-              ;;
-            *)
-              echo "deb     $mirror ${suite_alias}-${SUITE_VARIANT} main" >> "$SRCL"
-              echo "deb-src $mirror ${suite_alias}-${SUITE_VARIANT} main" >> "$SRCL"
-              ;;
-          esac
+          echo "deb     $mirror ${suite_alias}-${SUITE_VARIANT} main" >> "$SRCL"
+          echo "deb-src $mirror ${suite_alias}-${SUITE_VARIANT} main" >> "$SRCL"
           ;;
       esac
       ;;