From: Christoph Egger Date: Thu, 30 Jul 2015 08:50:29 +0000 (+0200) Subject: Add support for jessie-kfreebsd suites X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=ba67645163f788eb1ba9657cbb579802f2d300bb;p=mirror%2Fdsa-puppet.git Add support for jessie-kfreebsd suites Update the $CHROOT_ALIAS globs to match jessie-kfreebsd suite (which have one extra dash in them compared to the relative "normal" suites) Signed-off-by: Héctor Orón Martínez --- diff --git a/modules/schroot/files/schroot-setup.d/99builddsourceslist b/modules/schroot/files/schroot-setup.d/99builddsourceslist index 3828c175b..95a33d38e 100755 --- a/modules/schroot/files/schroot-setup.d/99builddsourceslist +++ b/modules/schroot/files/schroot-setup.d/99builddsourceslist @@ -49,6 +49,16 @@ shopt -s extglob if ! echo "$CHROOT_DESCRIPTION" | grep -q '(source chroot)' ; then CHROOT_ALIAS="${CHROOT_ALIAS/#experimental-/sid-experimental-}" case $CHROOT_ALIAS in + +([^-])-kfreebsd-+([^-])-kfreebsd-*-sbuild*) + SUITE_BASE=$(echo $CHROOT_ALIAS | cut -f1-2 -d-) + SUITE_VARIANT=$(echo $CHROOT_ALIAS | cut -f3 -d-) + ;; + +([^-])-kfreebsd-kfreebsd-*-sbuild*) + SUITE_BASE=$(echo $CHROOT_ALIAS | cut -f1-2 -d-) + if [ ${SUITE_BASE} != "sid" ]; then + SUITE_VARIANT="proposed-updates" + fi + ;; +([^-])-+([^-])-@(kfreebsd|hurd)-*-sbuild*) SUITE_BASE=$(echo $CHROOT_ALIAS | cut -f1 -d-) SUITE_VARIANT=$(echo $CHROOT_ALIAS | cut -f2 -d-)