[ajt] handle udebs in any component in generate_releases

diff --git a/ChangeLog b/ChangeLog
index ffce70ec4b90036f05c7a0ca22b8a51f61ae93d4..c59eeeeb5b9678954c473d505757024d9dab631c 100644 (file)
--- 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 c01a0c296c47d1ac680aa4b6fd3123108f8dda33..094c05644c8fde9a9932f225d10c8de7dc507d5c 100755 (executable)
--- 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]