Also check for invalid package list indentation

diff --git a/ChangeLog b/ChangeLog
index f09a1b02bbf8aaac240c35400f0d7cd8430ad908..d6681b8be26c1194234d18a501bc17e6f38276a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-18  Joerg Jaspert  <joerg@debian.org>
+
+       * dak/transitions.py (load_transitions): Additionally check for
+       invalid package list indentation
+
 2008-04-17  Joerg Jaspert  <joerg@debian.org>
 
        * config/debian/dak.conf: Add TempPath statement for the Release

diff --git a/dak/transitions.py b/dak/transitions.py
index 530ef0c87d99b4677ae87b2c38287d2ffee27c2e..fb72777eff2712fc3d4dfed589f5ef134b48f14c 100755 (executable)
--- a/dak/transitions.py
+++ b/dak/transitions.py
@@ -23,7 +23,7 @@
 
 ################################################################################
 
-import os, pg, sys, time, errno, fcntl, tempfile, pwd
+import os, pg, sys, time, errno, fcntl, tempfile, pwd, re
 import apt_pkg
 import daklib.database
 import daklib.utils
@@ -34,6 +34,8 @@ Cnf = None
 Options = None
 projectB = None
 
+re_broken_package = re.compile(r"[a-zA-Z]\w+\s+\-.*")
+
 ################################################################################
 
 #####################################
@@ -125,12 +127,17 @@ def load_transitions(trans_file):
                 if type(t[key]) != list:
                     print "ERROR: Unknown type %s for packages in transition %s." % (type(t[key]), test)
                     failure = True
-
+                if re_broken_package.match(key):
+                    # Someone had a space too much (or not enough), we have something looking like
+                    # "package1 - package2" now.
+                    print "ERROR: Invalid indentation of package list in transition %s, around package(s): %s" % (test, key)
+                    failure = True
                 try:
                     for package in t["packages"]:
                         if type(package) != str:
                             print "ERROR: Packages list contains invalid type %s (as %s) in transition %s" % (type(package), package, test)
                             failure = True
+                        if 
                 except TypeError:
                     # In case someone has an empty packages list
                     print "ERROR: No packages defined in transition %s" % (test)