make-distros-flight: Key "snapshot" special case off $branch

This eliminates two places where $debian_suite is expected to contain
"snapshot" rather than a suite.

We want to change debian_suite to always contain a real suite, so that
we can fold its uses in to other suite variables.

No functional change for existing branches.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/make-distros-flight b/make-distros-flight
index 9b4684db84d4a7544855b06b95ffd9a204e681bb..060eda303ce49ef42668b91c1aea1bde583e6e2b 100755 (executable)
--- a/make-distros-flight
+++ b/make-distros-flight
@@ -66,7 +66,7 @@ test_matrix_branch_filter_callback () {
 test_do_one_netboot () {
   local diurl=
 
-  if [ x$gsuite = xsnapshot ] ; then
+  if [ $branch = distros-debian-snapshot ] ; then
       diurl="http://d-i.debian.org/daily-images/$domU/daily/netboot"
       gsuite=sid
       gver=daily
@@ -174,7 +174,7 @@ test_matrix_do_one () {
     gsuite=$debian_suite
     test_do_one_netboot
 
-    if [ $debian_suite = "snapshot" ]; then
+    if [ $branch = distros-debian-snapshot ]; then
         gsuite=sid
         for cd in current weekly ; do
           case ${domU}_${gsuite} in