Always provide a checksum of uncompressed Contents files

[dak.git] / dak / generate_releases.py

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index 57830390aa19c0815067adb35bd6a612e34e3c13..3b95ae5341d3017cbfb801fef6aa3b7a2e58a7b1 100755 (executable)
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -159,6 +159,11 @@ class ReleaseWriter(object):
         out = open(outfile + ".new", "w")
 
         for key, dbfield in attribs:
+            # Hack to skip NULL Version fields as we used to do this
+            # We should probably just always ignore anything which is None
+            if key == "Version" and getattr(suite, dbfield) is None:
+                continue
+
             out.write("%s: %s\n" % (key, getattr(suite, dbfield)))
 
         out.write("Date: %s\n" % (time.strftime("%a, %d %b %Y %H:%M:%S UTC", time.gmtime(time.time()))))
@@ -259,11 +264,6 @@ class ReleaseWriter(object):
             if filename in fileinfo.keys():
                 continue
 
-            # Skip uncompressed Contents files as they're huge, take ages to
-            # checksum and we checksum the compressed ones anyways
-            if os.path.basename(filename).startswith("Contents"):
-                continue
-
             fileinfo[filename] = {}
 
             # File handler is comp[0], filename of compressed file is comp[1]