Merge branch 'master' into security

[dak.git] / daklib / utils.py

diff --git a/daklib/utils.py b/daklib/utils.py
index 86e51a2f5c852f5b8c53b42741db14fcb96265ef..fc1465d1b689bf8495e741d2ae355e57d924ba82 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -394,11 +394,12 @@ def parse_checksums(where, files, manifest, hashname):
         if not line:
             break
         hash, size, file = line.strip().split(' ')
+        if not files.has_key(file):
         # TODO: check for the file's entry in the original files dict, not
         # the one modified by (auto)byhand and other weird stuff
-        #if not files.has_key(file):
         #    rejmsg.append("%s: not present in files but in checksums-%s in %s" %
         #        (file, hashname, where))
+            continue
         if not files[file]["size"] == size:
             rejmsg.append("%s: size differs for files and checksums-%s entry "\
                 "in %s" % (file, hashname, where))
@@ -435,7 +436,10 @@ def build_file_list(changes, is_a_dsc=0, field="files", hashname="md5sum"):
         format = format[:2]
 
     if is_a_dsc:
-        if format != (1,0):
+        # format = (1,0) are the only formats we currently accept,
+        # format = (0,0) are missing format headers of which we still
+        # have some in the archive.
+        if format != (1,0) and format != (0,0):
             raise UnknownFormatError, "%s" % (changes.get("format","0.0"))
     else:
         if (format < (1,5) or format > (1,8)):