X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Ftransitions.py;h=e7cb99e805994d3fb259e5bbb8b993eb2bb7380d;hb=9f9da35e524274a0a013279cbe0b52fb8f0d0930;hp=af39ee23a52ff788ac28c66094dd1b8386694a39;hpb=c8703c1b85022407fc5a1c2924f45f9bdd1578f8;p=dak.git

diff --git a/dak/transitions.py b/dak/transitions.py
index af39ee23..e7cb99e8 100755
--- a/dak/transitions.py
+++ b/dak/transitions.py
@@ -112,46 +112,66 @@ def load_transitions(trans_file):
 
     # lets do further validation here
     checkkeys = ["source", "reason", "packages", "new", "rm"]
-    for test in trans:
-        t = trans[test]
-
-        # First check if we know all the keys for the transition and if they have
-        # the right type (and for the packages also if the list has the right types
-        # included, ie. not a list in list, but only str in the list)
-        for key in t:
-            if key not in checkkeys:
-                print "ERROR: Unknown key %s in transition %s" % (key, test)
-                failure = True
-
-            if key == "packages":
-                if type(t[key]) != list:
-                    print "ERROR: Unknown type %s for packages in transition %s." % (type(t[key]), test)
+
+    # If we get an empty definition - we just have nothing to check, no transitions defined
+    if type(trans) != dict:
+        # This can be anything. We could have no transitions defined. Or someone totally fucked up the
+        # file, adding stuff in a way we dont know or want. Then we set it empty - and simply have no
+        # transitions anymore. User will see it in the information display after he quit the editor and
+        # could fix it
+        trans = ""
+        return trans
+
+    try:
+        for test in trans:
+            t = trans[test]
+        
+            # First check if we know all the keys for the transition and if they have
+            # the right type (and for the packages also if the list has the right types
+            # included, ie. not a list in list, but only str in the list)
+            for key in t:
+                if key not in checkkeys:
+                    print "ERROR: Unknown key %s in transition %s" % (key, test)
                     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 re_broken_package.match(package):
-                            # 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, package)
-                            failure = True
-                except TypeError:
-                    # In case someone has an empty packages list
-                    print "ERROR: No packages defined in transition %s" % (test)
+        
+                if key == "packages":
+                    if type(t[key]) != list:
+                        print "ERROR: Unknown type %s for packages in transition %s." % (type(t[key]), test)
+                        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 re_broken_package.match(package):
+                                # 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, package)
+                                failure = True
+                    except TypeError:
+                        # In case someone has an empty packages list
+                        print "ERROR: No packages defined in transition %s" % (test)
+                        failure = True
+                        continue
+        
+                elif type(t[key]) != str:
+                    if key == "new" and type(t[key]) == int:
+                        # Ok, debian native version
+                        continue
+                    else:
+                        print "ERROR: Unknown type %s for key %s in transition %s" % (type(t[key]), key, test)
+                        failure = True
+        
+            # And now the other way round - are all our keys defined?
+            for key in checkkeys:
+                if key not in t:
+                    print "ERROR: Missing key %s in transition %s" % (key, test)
                     failure = True
-                    continue
-
-            elif type(t[key]) != str:
-                print "ERROR: Unknown type %s for key %s in transition %s" % (type(t[key]), key, test)
-                failure = True
+    except TypeError:
+        # In case someone defined very broken things
+        print "ERROR: Unable to parse the file"
+        failure = True
 
-        # And now the other way round - are all our keys defined?
-        for key in checkkeys:
-            if key not in t:
-                print "ERROR: Missing key %s in transition %s" % (key, test)
-                failure = True
 
     if failure:
         return None