From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 6 May 2015 06:02:56 +0000 (+0200)
Subject: Also extract arch info from schroot name
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=555681574b5ccb35e0271515d753961900d7b24b;p=mirror%2Fdsa-puppet.git

Also extract arch info from schroot name
---

diff --git a/modules/schroot/files/schroot-dsa/config b/modules/schroot/files/schroot-dsa/config
index 688f8b6c6..25d36b108 100644
--- a/modules/schroot/files/schroot-dsa/config
+++ b/modules/schroot/files/schroot-dsa/config
@@ -20,14 +20,18 @@ if [ "$CHROOT_SESSION_PURGE" = "true" ]; then
     case $CHROOT_DESCRIPTION in
         "["*-*_*-dchroot"]"*)
             chroot_type="$CHROOT_DESCRIPTION"; chroot_type="${chroot_type#\[}"; chroot_type="${chroot_type%%]*}"
-            suitevariant_arch_tuple="${chroot_type%%-dchroot-*}"
+            suitevariant_arch_tuple="${chroot_type%%-dchroot}"
             suitevariant=${suitevariant_arch_tuple%_*}
+            SUITE_ARCH=${suitevariant_arch_tuple##*_}
             SUITE_BASE=${suitevariant%-*}
             SUITE_VARIANT=${suitevariant##*-}
         ;;
         "["*_*-dchroot"]"*)
             chroot_type="$CHROOT_DESCRIPTION"; chroot_type="${chroot_type#\[}"; chroot_type="${chroot_type%%]*}"
-            SUITE_BASE="${chroot_type%%_*}"
+            suite_arch_tuple="${chroot_type%%-dchroot}"
+            SUITE_ARCH=${suite_arch_tuple##*_}
+            SUITE_BASE="${suite_arch_tuple%%_*}"
+            SUITE_VARIANT=""
         ;;
         *)
             if [ "$STAGE" = "setup-start" ]; then