From: James Troup <james@nocrew.org>
Date: Tue, 13 Feb 2007 13:58:03 +0000 (+0000)
Subject: [ajt] handle udebs in any component in generate_releases
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;ds=sidebyside;h=73831e60bebce3aff8f61003b830438e5fa19448;hp=364e031f5eec5fe33e470a85a9caedfc1252ea48;p=dak.git

[ajt] handle udebs in any component in generate_releases
---

diff --git a/ChangeLog b/ChangeLog
index ffce70ec..c59eeeeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2007-02-08  Anthony Towns  <ajt@debian.org>
 
+	* dak/generate_releases.py (main): handle udebs in any component.
+
 	* daklib/queue.py (Upload.build_summaries): handle files without a
 	'type' gracefully.
 
diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index c01a0c29..094c0564 100755
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -258,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]