X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=f2efe8c0393439dbfe812bd542e30514d240845c;hb=68e191dfee7b1a40bfbae5d525f9ff2187459e6c;hp=11b480a072096674d6017c4f357af3a46837a633;hpb=05e649f2cfaa94ac361cb2df2e9a810adeb9c943;p=dak.git

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 11b480a0..f2efe8c0 100755
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -30,10 +30,10 @@
 
 import commands, errno, fcntl, os, re, shutil, stat, sys, time, tempfile, traceback
 import apt_inst, apt_pkg
-import daklib.database as database
-import daklib.logging as logging
-import daklib.queue as queue
-import daklib.utils as utils
+from daklib import database
+from daklib import logging
+from daklib import queue
+from daklib import utils
 from daklib.dak_exceptions import *
 
 from types import *
@@ -700,6 +700,9 @@ def check_dsc():
     except NoFilesFieldError:
         reject("%s: no Files: field." % (dsc_filename))
         return 0
+    except UnknownFormatError, format:
+        reject("%s: unknown format '%s'." % (dsc_filename, format))
+        return 0
     except ParseChangesError, line:
         reject("%s: parse error, can't grok: %s." % (dsc_filename, line))
         return 0
@@ -906,10 +909,10 @@ def check_urgency ():
     if changes["architecture"].has_key("source"):
         if not changes.has_key("urgency"):
             changes["urgency"] = Cnf["Urgency::Default"]
+        changes["urgency"] = changes["urgency"].lower()
         if changes["urgency"] not in Cnf.ValueList("Urgency::Valid"):
             reject("%s is not a valid urgency; it will be treated as %s by testing." % (changes["urgency"], Cnf["Urgency::Default"]), "Warning: ")
             changes["urgency"] = Cnf["Urgency::Default"]
-        changes["urgency"] = changes["urgency"].lower()
 
 ################################################################################
 
@@ -948,6 +951,8 @@ def check_hashes ():
             check_hash(".changes %s" % (h), fs, h, f, files)
         except NoFilesFieldError:
             reject("No Checksums-%s: field in .changes" % (h))
+        except UnknownFormatError, format:
+            reject("%s: unknown format of .changes" % (format))
         except ParseChangesError, line:
             reject("parse error for Checksums-%s in .changes, can't grok: %s." % (h, line))
 
@@ -956,6 +961,8 @@ def check_hashes ():
         try:
             fs = utils.build_file_list(dsc, 1, "checksums-%s" % h, h)
             check_hash(".dsc %s" % (h), fs, h, f, dsc_files)
+        except UnknownFormatError, format:
+            reject("%s: unknown format of .dsc" % (format))
         except NoFilesFieldError:
             reject("No Checksums-%s: field in .dsc" % (h))
         except ParseChangesError, line: