drop generation of md5sum output in release files

[dak.git] / dak / generate_releases.py

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index 2e28fb28e39207ea21bcb6bd05dd762ea3157c80..5644b957646e5280dbeedfc5230b199ad2e4f77d 100755 (executable)
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -4,7 +4,7 @@
 
 @contact: Debian FTPMaster <ftpmaster@debian.org>
 @Copyright: 2001, 2002, 2006  Anthony Towns <ajt@debian.org>
-@copyright: 2009  Joerg Jaspert <joerg@debian.org>
+@copyright: 2009, 2011  Joerg Jaspert <joerg@debian.org>
 @license: GNU General Public License version 2 or later
 """
 # This program is free software; you can redistribute it and/or modify
@@ -108,7 +108,7 @@ def compressnames (tree,type,file):
 decompressors = { 'zcat' : gzip.GzipFile,
                   'bzip2' : bz2.BZ2File }
 
-def print_md5sha_files (tree, files, hashop):
+def print_hash_files (tree, files, hashop):
     path = Cnf["Dir::Root"] + tree + "/"
     for name in files:
         hashvalue = ""
@@ -141,14 +141,11 @@ def print_md5sha_files (tree, files, hashop):
         else:
             out.write(" %s %8d %s\n" % (hashvalue, hashlen, name))
 
-def print_md5_files (tree, files):
-    print_md5sha_files (tree, files, apt_pkg.md5sum)
-
 def print_sha1_files (tree, files):
-    print_md5sha_files (tree, files, apt_pkg.sha1sum)
+    print_hash_files (tree, files, apt_pkg.sha1sum)
 
 def print_sha256_files (tree, files):
-    print_md5sha_files (tree, files, apt_pkg.sha256sum)
+    print_hash_files (tree, files, apt_pkg.sha256sum)
 
 def write_release_file (relpath, suite, component, origin, label, arch, version="", suite_suffix="", notautomatic="", butautomaticupgrades=""):
     try:
@@ -314,12 +311,12 @@ def main ():
                             files.append(cfile)
                         add_tiffani(files, Cnf["Dir::Root"] + tree, filepath)
                     else:
-                        disks = "%s/disks-%s" % (sec, arch)
-                        diskspath = Cnf["Dir::Root"]+tree+"/"+disks
-                        if os.path.exists(diskspath):
-                            for dir in os.listdir(diskspath):
-                                if os.path.exists("%s/%s/md5sum.txt" % (diskspath, dir)):
-                                    files.append("%s/%s/md5sum.txt" % (disks, dir))
+                        installer = "%s/installer-%s" % (sec, arch)
+                        installerpath = Cnf["Dir::Root"]+tree+"/"+installer
+                        if os.path.exists(installerpath):
+                            for directory in os.listdir(installerpath):
+                                if os.path.exists("%s/%s/images/MD5SUMS" % (installerpath, directory)):
+                                    files.append("%s/%s/images/MD5SUMS" % (installer, directory))
 
                         filepath = "%s/binary-%s/Packages" % (sec, arch)
                         for cfile in compressnames("tree::%s" % (tree), "Packages", filepath):
@@ -371,8 +368,6 @@ def main ():
         else:
             print "ALERT: no tree/bindirectory for %s" % (tree)
 
-        out.write("MD5Sum:\n")
-        print_md5_files(tree, files)
         out.write("SHA1:\n")
         print_sha1_files(tree, files)
         out.write("SHA256:\n")