X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=5884db181ab6bf302a6a177e5ee8f6a1d06e29ab;hb=fe251f39e14ab78f06ad750fa0a24f9d7666e97b;hp=93187709cf78bc4dedf12c998b8b3539b13f2441;hpb=6c793f19473346ffb891d9a3b777775ca9790207;p=dak.git

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 93187709..5884db18 100755
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -919,19 +919,14 @@ def check_urgency ():
 ################################################################################
 
 def check_hashes ():
-    # Make sure we recognise the format of the Files: field
-    format = changes.get("format", "0.0").split(".",1)
-    if len(format) == 2:
-        format = int(format[0]), int(format[1])
-    else:
-        format = int(float(format[0])), 0
-
-    utils.check_hash(".changes", files, "md5sum", apt_pkg.md5sum)
-    utils.check_hash(".dsc", dsc_files, "md5sum", apt_pkg.md5sum)
+    utils.check_hash(".changes", files, "md5", apt_pkg.md5sum)
+    utils.check_size(".changes", files)
+    utils.check_hash(".dsc", dsc_files, "md5", apt_pkg.md5sum)
+    utils.check_size(".dsc", dsc_files)
 
     # This is stupid API, but it'll have to do for now until
     # we actually have proper abstraction
-    for m in utils.ensure_hashes(Upload):
+    for m in utils.ensure_hashes(changes, dsc, files, dsc_files):
         reject(m)
 
 ################################################################################
@@ -1055,8 +1050,6 @@ def check_signed_by_key():
             for si in q.getresult():
                 if si[0] not in source_ids: source_ids.append(si[0])
 
-        print "source_ids: %s" % (",".join([str(x) for x in source_ids]))
-
         is_nmu = 1
         for si in source_ids:
             is_nmu = 1