From: Ansgar Burchardt <ansgar@debian.org>
Date: Fri, 4 Sep 2015 18:06:55 +0000 (+0200)
Subject: Merge remote-tracking branches 'nthykier/fix-generate-releases' and 'nthykier/fix... 
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=f010139409e1647bf4cfdb7c296c292c7bbd6a8f;hp=be1e0fd28f4000cb6717d52f9ef8fda9da6bb920;p=dak.git

Merge remote-tracking branches 'nthykier/fix-generate-releases' and 'nthykier/fix-auto-decrufter'
---

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index 06ddea6c..2814b24a 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)
@@ -246,11 +246,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:
+                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:
+                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:
+                elif entry.endswith(".xz") and filename[:-3] not in uncompnotseen:
                     uncompnotseen[filename[:-3]] = (XzFile, filename)
 
                 fileinfo[filename]['len'] = len(contents)