X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_releases.py;h=a1ef074f49a62b29230bd0e1c7c5e4600e5ca3ac;hb=ee9797a2eb6f4db22e48ede6667c18fbc4c3301c;hp=57830390aa19c0815067adb35bd6a612e34e3c13;hpb=14ca1d5ed8b7ea783d57d76802d8cb93d7f2fabb;p=dak.git

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index 57830390..a1ef074f 100755
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -70,7 +70,7 @@ Generate the Release files
   -h, --help                 show this help and exit
   -q, --quiet                Don't output progress
 
-SUITE can be a space seperated list, e.g.
+SUITE can be a space separated list, e.g.
    --suite=unstable testing
   """
     sys.exit(exit_code)
@@ -139,7 +139,9 @@ class ReleaseWriter(object):
                     ('Label',       'label'),
                     ('Suite',       'release_suite_output'),
                     ('Version',     'version'),
-                    ('Codename',    'codename') )
+                    ('Codename',    'codename'),
+                    ('Changelogs',  'changelog_url'),
+                  )
 
         # A "Sub" Release file has slightly different fields
         subattribs = ( ('Archive',  'suite_name'),
@@ -159,6 +161,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 in ("Version", "Changelogs") 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()))))
@@ -241,11 +248,11 @@ class ReleaseWriter(object):
                 # If we find a file for which we have a compressed version and
                 # haven't yet seen the uncompressed one, store the possibility
                 # for future use
-                if entry.endswith(".gz") and entry[:-3] not in uncompnotseen.keys():
+                if entry.endswith(".gz") and filename[:-3] not in uncompnotseen:
                     uncompnotseen[filename[:-3]] = (gzip.GzipFile, filename)
-                elif entry.endswith(".bz2") and entry[:-4] not in uncompnotseen.keys():
+                elif entry.endswith(".bz2") and filename[:-4] not in uncompnotseen:
                     uncompnotseen[filename[:-4]] = (bz2.BZ2File, filename)
-                elif entry.endswith(".xz") and entry[:-3] not in uncompnotseen.keys():
+                elif entry.endswith(".xz") and filename[:-3] not in uncompnotseen:
                     uncompnotseen[filename[:-3]] = (XzFile, filename)
 
                 fileinfo[filename]['len'] = len(contents)
@@ -256,12 +263,7 @@ class ReleaseWriter(object):
         for filename, comp in uncompnotseen.items():
             # If we've already seen the uncompressed file, we don't
             # need to do anything again
-            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"):
+            if filename in fileinfo:
                 continue
 
             fileinfo[filename] = {}