X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_releases.py;h=cc6327f0c9d2030fcdd011a9b00e16dfb29931c9;hb=951a3cb563e7932646d40fbc77759efb8b50a271;hp=9c065ace7460b1dd6517048d3bfe4e0b0483a454;hpb=a4c434107399cb89cf4a6776ed5184d3f8c2d68e;p=dak.git diff --git a/dak/generate_releases.py b/dak/generate_releases.py index 9c065ace..cc6327f0 100755 --- a/dak/generate_releases.py +++ b/dak/generate_releases.py @@ -125,7 +125,7 @@ class HashFunc(object): self.db_name = db_name RELEASE_HASHES = [ - HashFunc('MD5Sum', apt_pkg.md5sum, 'md5'), + HashFunc('MD5Sum', apt_pkg.md5sum, 'md5sum'), HashFunc('SHA1', apt_pkg.sha1sum, 'sha1'), HashFunc('SHA256', apt_pkg.sha256sum, 'sha256'), ] @@ -206,8 +206,8 @@ class ReleaseWriter(object): query = "SELECT path FROM hashfile WHERE suite_id = :id" q = session.execute(query, {'id': self.suite.suite_id}) known_hashfiles = set(row[0] for row in q) - updated = [] - new = [] + updated = set() + new = set() # Update the hashfile table with new or updated files for filename in fileinfo: @@ -219,15 +219,15 @@ class ReleaseWriter(object): field = h.release_field hashfile = os.path.join(byhashdir, field, fileinfo[filename][field]) if hashfile in known_hashfiles: - updated.append(hashfile) + updated.add(hashfile) else: - new.append(hashfile) + new.add(hashfile) if updated: session.execute(""" UPDATE hashfile SET unreferenced = NULL WHERE path = ANY(:p) AND suite_id = :id""", - {'p': updated, 'id': self.suite.suite_id}) + {'p': list(updated), 'id': self.suite.suite_id}) if new: session.execute(""" INSERT INTO hashfile (path, suite_id)