From: Joerg Jaspert Date: Tue, 15 Mar 2016 21:44:30 +0000 (+0100) Subject: Merge remote-tracking branch 'juliank/master' X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=61231287ac4be27e02244fbc45b212c3ae968da8;hp=2961c54465fca8fb45790906cb9f715cc36e204e;p=dak.git Merge remote-tracking branch 'juliank/master' * juliank/master: Only generate binary checksum fields for the requested ones Only generate fields in Sources for requested checksums Signed-off-by: Joerg Jaspert --- diff --git a/dak/generate_releases.py b/dak/generate_releases.py index a1ef074f..c3591772 100755 --- a/dak/generate_releases.py +++ b/dak/generate_releases.py @@ -224,9 +224,8 @@ class ReleaseWriter(object): os.chdir(os.path.join(suite.archive.path, "dists", suite.suite_name, suite_suffix)) - hashfuncs = { 'MD5Sum' : apt_pkg.md5sum, - 'SHA1' : apt_pkg.sha1sum, - 'SHA256' : apt_pkg.sha256sum } + hashfuncs = dict(zip([x.upper().replace('UM', 'um') for x in suite.checksums], + [getattr(apt_pkg, "%s" % (x)) for x in [x.replace("sum", "") + "sum" for x in suite.checksums]])) fileinfo = {}