[OSSTEST PATCH 4/6] make-flight: Make debian_suite always contain a suite

[Ian Jackson <ian.jackson@eu.citrix.com>]

The setting of the suite to "sid" in the snapshot case now occurs in
the case at the top of the script.

This means that gsuite always contains the actual suite name, and the
special cases which set it to sid can be removed.

No functional change.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 make-distros-flight |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/make-distros-flight b/make-distros-flight
index 060eda3..fa5b71b 100755
--- a/make-distros-flight
+++ b/make-distros-flight
@@ -34,6 +34,7 @@ defsuite=`getconfig DebianSuite`
 defguestsuite=`getconfig GuestDebianSuite`
 
 case $branch in
+  distros-debian-snapshot) debian_suite=sid ;;
   distros-debian-*) debian_suite=${branch#distros-debian-} ;;
   *)                echo $branch >&2; exit 1               ;;
 esac
@@ -68,7 +69,6 @@ test_do_one_netboot () {
 
   if [ $branch = distros-debian-snapshot ] ; then
       diurl="http://d-i.debian.org/daily-images/$domU/daily/netboot"
-      gsuite=sid
       gver=daily
   else
     #local mirror="http://`getconfig DebianMirrorHost`/`getconfig DebianMirrorSubpath`"
@@ -175,7 +175,6 @@ test_matrix_do_one () {
     test_do_one_netboot
 
     if [ $branch = distros-debian-snapshot ]; then
-        gsuite=sid
         for cd in current weekly ; do
           case ${domU}_${gsuite} in
             armhf_*) continue;; # No iso targets for armhf
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel