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 ce8f12815009a70a0ea9cb4e77eda77564c197de..3b95ae5341d3017cbfb801fef6aa3b7a2e58a7b1 100755 (executable)
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -137,7 +137,7 @@ class ReleaseWriter(object):
         # fill them in
         attribs = ( ('Origin',      'origin'),
                     ('Label',       'label'),
-                    ('Suite',       'suite_name'),
+                    ('Suite',       'release_suite_output'),
                     ('Version',     'version'),
                     ('Codename',    'codename') )
 
@@ -159,16 +159,12 @@ class ReleaseWriter(object):
         out = open(outfile + ".new", "w")
 
         for key, dbfield in attribs:
-            if getattr(suite, dbfield) is not None:
-                # TEMPORARY HACK HACK HACK until we change the way we store the suite names etc
-                if key == 'Suite' and getattr(suite, dbfield) == 'squeeze-updates':
-                    out.write("Suite: oldstable-updates\n")
-                elif key == 'Suite' and getattr(suite, dbfield) == 'wheezy-updates':
-                    out.write("Suite: stable-updates\n")
-                elif key == 'Suite' and getattr(suite, dbfield) == 'jessie-updates':
-                    out.write("Suite: testing-updates\n")
-                else:
-                    out.write("%s: %s\n" % (key, getattr(suite, dbfield)))
+            # 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()))))
 
@@ -268,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]