From: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon, 20 Aug 2018 17:43:17 +0000 (+0200)
Subject: 99builddsourceslist: remove jessie-kfreebsd hacks
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=de84bd474e9c26f9fd5a645a331cf858daae0123;p=mirror%2Fdsa-puppet.git

99builddsourceslist: remove jessie-kfreebsd hacks
---

diff --git a/modules/schroot/files/schroot-setup.d/99builddsourceslist b/modules/schroot/files/schroot-setup.d/99builddsourceslist
index 506a55cb4..434249026 100755
--- a/modules/schroot/files/schroot-setup.d/99builddsourceslist
+++ b/modules/schroot/files/schroot-setup.d/99builddsourceslist
@@ -150,12 +150,7 @@ if [ "$1" = "setup-start" ] || [ "$1" = "setup-recover" ]; then
             fi
 
         elif [ "${SUITE_VARIANT%%-sloppy}" = 'backports' ]; then
-            # Hack: for kfreebsd-* the base suite for jessie-backports and jessie-backports-sloppy is jessie-kfreebsd (and not jessie)
-            if echo "${CHROOT_ALIAS}" | grep -q 'kfreebsd-\w\+-sbuild$' ; then
-                SUITES="${SUITE_BASE}-kfreebsd"
-            else
-                SUITES="${SUITE_BASE}"
-            fi
+            SUITES="${SUITE_BASE}"
             [ -n "${debian_mirror}" ] && domirror "${debian_mirror} SUITE COMPONENT" ${APT_LIST}
             domirror "http://ftp.debian.org/debian SUITE COMPONENT" ${APT_LIST}
             SUITES="${SUITE_BASE}"