[??] sync with ftp-master/dak master

[dak.git] / dak / make_overrides.py

diff --git a/dak/make_overrides.py b/dak/make_overrides.py
index 24ac0a707c535a2daedf330478acf8eadffe910d..53bf2dfad6ac634f6de8ae6c5bd2090b2c112ed4 100755 (executable)
--- a/dak/make_overrides.py
+++ b/dak/make_overrides.py
@@ -110,12 +110,12 @@ def main ():
                 if otype == "deb":
                     suffix = ""
                 elif otype == "udeb":
-                    if component != "main":
+                    if component == "contrib":
                         continue; # Ick2
                     suffix = ".debian-installer"
                 elif otype == "dsc":
                     suffix = ".src"
-                filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, component.replace("non-US/", ""), suffix)
+                filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, component, suffix)
                 output_file = daklib.utils.open_file(filename, 'w')
                 do_list(output_file, suite, component, otype)
                 output_file.close()