X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_releases.py;h=094c05644c8fde9a9932f225d10c8de7dc507d5c;hb=73d7a91a0d64633260a2ddd79a54f99e2d4f8ad1;hp=95b36b1f1f7dfa840eaefa0bd2a8128ad02e4075;hpb=6000b8c45eb1729cd43ac16716152252850d851c;p=dak.git

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index 95b36b1f..094c0564 100755
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -118,6 +118,9 @@ def print_md5_files (tree, files):
 def print_sha1_files (tree, files):
     print_md5sha_files (tree, files, apt_pkg.sha1sum)
 
+def print_sha256_files (tree, files):
+    print_md5sha_files (tree, files, apt_pkg.sha256sum)
+
 ################################################################################
 
 def main ():
@@ -255,14 +258,18 @@ def main ():
                     files.append(rel)
 
 	    if AptCnf.has_key("tree::%s/main" % (tree)):
-	        sec = AptCnf["tree::%s/main::Sections" % (tree)].split()[0]
-		if sec != "debian-installer":
-	    	    print "ALERT: weird non debian-installer section in %s" % (tree)
-
-		for arch in AptCnf["tree::%s/main::Architectures" % (tree)].split():
-		    if arch != "source":  # always true
-			for file in compressnames("tree::%s/main" % (tree), "Packages", "main/%s/binary-%s/Packages" % (sec, arch)):
-			    files.append(file)
+	        for dis in ["main", "contrib", "non-free"]:
+		    if not AptCnf.has_key("tree::%s/%s" % (tree, dis)): continue
+	            sec = AptCnf["tree::%s/%s::Sections" % (tree,dis)].split()[0]
+		    if sec != "debian-installer":
+	    	        print "ALERT: weird non debian-installer section in %s" % (tree)
+
+		    for arch in AptCnf["tree::%s/%s::Architectures" % (tree,dis)].split():
+		        if arch != "source":  # always true
+			    for file in compressnames("tree::%s/%s" % (tree,dis),
+			    	"Packages", 
+				"%s/%s/binary-%s/Packages" % (dis, sec, arch)):
+			        files.append(file)
 	    elif AptCnf.has_key("tree::%s::FakeDI" % (tree)):
 		usetree = AptCnf["tree::%s::FakeDI" % (tree)]
 		sec = AptCnf["tree::%s/main::Sections" % (usetree)].split()[0]
@@ -286,6 +293,8 @@ def main ():
 	print_md5_files(tree, files)
 	out.write("SHA1:\n")
 	print_sha1_files(tree, files)
+	out.write("SHA256:\n")
+	print_sha256_files(tree, files)
 
 	out.close()
 	if Cnf.has_key("Dinstall::SigningKeyring"):