Merge branch 'master' into security

[dak.git] / daklib / utils.py

diff --git a/daklib/utils.py b/daklib/utils.py
index 03135e72e4a58fe99dc9ad05c8506c707957d55f..fc1465d1b689bf8495e741d2ae355e57d924ba82 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -267,7 +267,7 @@ def check_hash(where, files, hashname, hashfunc):
                         where))
             except CantOpenError:
                 # TODO: This happens when the file is in the pool.
-                warn("Cannot open file %s" % f)
+                # warn("Cannot open file %s" % f)
                 continue
         finally:
             if file_handle:
@@ -395,11 +395,15 @@ def parse_checksums(where, files, manifest, hashname):
             break
         hash, size, file = line.strip().split(' ')
         if not files.has_key(file):
-            rejmsg.append("%s: not present in files but in checksums-%s in %s" %
-                (file, hashname, where))
+        # TODO: check for the file's entry in the original files dict, not
+        # the one modified by (auto)byhand and other weird stuff
+        #    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))
+            continue
         files[file][hash_key(hashname)] = hash
     for f in files.keys():
         if not files[f].has_key(hash_key(hashname)):
@@ -432,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)):