mixed component

remove the mixed component part, its LONG gone.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 3cd6705bdbf25da0a9aaeea5007f0e99d4e29eac..d3b9bada74648680ef54e9d531b351e4684f6dfe 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -631,12 +631,6 @@ Component
        Description "Software that fails to meet the DFSG";
        MeetsDFSG "false";
   };
-
-  mixed  // **NB:** only used for overrides; not yet used in other code
-  {
-       Description "Legacy Mixed";
-       MeetsDFSG "false";
-  };
 };
 
 Section

diff --git a/dak/check_archive.py b/dak/check_archive.py
index f7230b00ee51608cb7a8ca46cff3a5cf74f88ac5..80782908864f5a72ed52ee5fbd55b76976fc3d1a 100755 (executable)
--- a/dak/check_archive.py
+++ b/dak/check_archive.py
@@ -151,8 +151,6 @@ def check_dscs():
     count = 0
     suite = 'unstable'
     for component in Cnf.SubTree("Component").List():
-        if component == "mixed":
-            continue
         component = component.lower()
         list_filename = '%s%s_%s_source.list' % (Cnf["Dir::Lists"], suite, component)
         list_file = utils.open_file(list_filename)

diff --git a/dak/check_overrides.py b/dak/check_overrides.py
index ff01306d828e1e542f7a0c2735c7e51555885941..1e7e538468a6e4c47aadd0f02b38a210baceb0ec 100755 (executable)
--- a/dak/check_overrides.py
+++ b/dak/check_overrides.py
@@ -331,8 +331,6 @@ def main ():
             utils.fubar("Couldn't find id's of all suites: %s" % suites)
 
         for component in Cnf.SubTree("Component").List():
-            if component == "mixed":
-                continue; # Ick
             # It is crucial for the dsc override creation based on binary
             # overrides that 'dsc' goes first
             otypes = Cnf.ValueList("OverrideType")

diff --git a/dak/import_archive.py b/dak/import_archive.py
index 3e5100be467c6e5efea85c8835bc614e61363a33..028239b0d4b3b374107ab52550e40e3ce1a02237 100755 (executable)
--- a/dak/import_archive.py
+++ b/dak/import_archive.py
@@ -233,13 +233,10 @@ def update_locations ():
         SubSec = Cnf.SubTree("Location::%s" % (location))
         archive_id = database.get_archive_id(SubSec["archive"])
         type = SubSec.Find("type")
-        if type == "legacy-mixed":
-            projectB.query("INSERT INTO location (path, archive, type) VALUES ('%s', %d, '%s')" % (location, archive_id, SubSec["type"]))
-        else:
-            for component in Cnf.SubTree("Component").List():
-                component_id = database.get_component_id(component)
-                projectB.query("INSERT INTO location (path, component, archive, type) VALUES ('%s', %d, %d, '%s')" %
-                               (location, component_id, archive_id, SubSec["type"]))
+        for component in Cnf.SubTree("Component").List():
+            component_id = database.get_component_id(component)
+            projectB.query("INSERT INTO location (path, component, archive, type) VALUES ('%s', %d, %d, '%s')" %
+                           (location, component_id, archive_id, SubSec["type"]))
 
 def update_architectures ():
     projectB.query("DELETE FROM architecture")
@@ -542,11 +539,7 @@ Please read the documentation before running this script.
         SubSec = Cnf.SubTree("Location::%s" % (location))
         server = SubSec["Archive"]
         type = Cnf.Find("Location::%s::Type" % (location))
-        if type == "legacy-mixed":
-            sources = location + 'Sources.gz'
-            suite = Cnf.Find("Location::%s::Suite" % (location))
-            do_sources(sources, suite, "",  server)
-        elif type == "legacy" or type == "pool":
+        if type == "pool":
             for suite in Cnf.ValueList("Location::%s::Suites" % (location)):
                 for component in Cnf.SubTree("Component").List():
                     sources = Cnf["Dir::Root"] + "dists/" + Cnf["Suite::%s::CodeName" % (suite)] + '/' + component + '/source/' + 'Sources.gz'
@@ -560,12 +553,7 @@ Please read the documentation before running this script.
         SubSec = Cnf.SubTree("Location::%s" % (location))
         server = SubSec["Archive"]
         type = Cnf.Find("Location::%s::Type" % (location))
-        if type == "legacy-mixed":
-            packages = location + 'Packages'
-            suite = Cnf.Find("Location::%s::Suite" % (location))
-            print 'Processing '+location+'...'
-            process_packages (packages, suite, "", server)
-        elif type == "legacy" or type == "pool":
+        if type == "pool":
             for suite in Cnf.ValueList("Location::%s::Suites" % (location)):
                 udeb_components = map(lambda x: x+"/debian-installer",
                                       Cnf.ValueList("Suite::%s::UdebComponents" % suite))

diff --git a/dak/init_db.py b/dak/init_db.py
index d6a7ebfb5710c5bb05edcc541cc6487fc0365268..e1f1bced854ddcece7528db09d150c0892d759f5 100755 (executable)
--- a/dak/init_db.py
+++ b/dak/init_db.py
@@ -106,11 +106,7 @@ def do_location():
             utils.fubar("Archive '%s' for location '%s' not found."
                                % (location_config["Archive"], location))
         location_type = location_config.get("type")
-        if location_type == "legacy-mixed":
-            projectB.query("INSERT INTO location (path, archive, type) VALUES "
-                           "('%s', %d, '%s')"
-                           % (location, archive_id, location_config["type"]))
-        elif location_type == "legacy" or location_type == "pool":
+        if location_type == "pool":
             for component in Cnf.SubTree("Component").List():
                 component_id = database.get_component_id(component)
                 projectB.query("INSERT INTO location (path, component, "

diff --git a/dak/make_overrides.py b/dak/make_overrides.py
index bff25dd96d539bc4287e26f3607d3b5c0ce630dd..8fdde8b18518d9fb8baaa9b34adeb4fb6ce01366 100755 (executable)
--- a/dak/make_overrides.py
+++ b/dak/make_overrides.py
@@ -125,8 +125,6 @@ def main ():
         sys.stderr.write("Processing %s...\n" % (suite))
         override_suite = Cnf["Suite::%s::OverrideCodeName" % (suite)]
         for component in Cnf.SubTree("Component").List():
-            if component == "mixed":
-                continue # Ick
             for otype in Cnf.ValueList("OverrideType"):
                 if otype == "deb":
                     suffix = ""

diff --git a/dak/make_suite_file_list.py b/dak/make_suite_file_list.py
index 941c73707e7cce26a4ee9abd787e3253a60c3e92..fdf2c5e3ea75acefe23120f54e641332229553a2 100755 (executable)
--- a/dak/make_suite_file_list.py
+++ b/dak/make_suite_file_list.py
@@ -202,34 +202,6 @@ def cleanup(packages):
 
 ################################################################################
 
-def write_legacy_mixed_filelist(suite, list, packages, dislocated_files):
-    # Work out the filename
-    filename = os.path.join(Cnf["Dir::Lists"], "%s_-_all.list" % (suite))
-    output = utils.open_file(filename, "w")
-    # Generate the final list of files
-    files = {}
-    for fileid in list:
-        path = packages[fileid]["path"]
-        filename = packages[fileid]["filename"]
-        file_id = packages[fileid]["file_id"]
-        if suite == "stable" and dislocated_files.has_key(file_id):
-            filename = dislocated_files[file_id]
-        else:
-            filename = path + filename
-        if files.has_key(filename):
-            utils.warn("%s (in %s) is duplicated." % (filename, suite))
-        else:
-            files[filename] = ""
-    # Sort the files since apt-ftparchive doesn't
-    keys = files.keys()
-    keys.sort()
-    # Write the list of files out
-    for outfile in keys:
-        output.write(outfile+'\n')
-    output.close()
-
-############################################################
-
 def write_filelist(suite, component, arch, type, list, packages, dislocated_files):
     # Work out the filename
     if arch != "source":
@@ -326,13 +298,8 @@ def write_filelists(packages, dislocated_files):
                                 filelist.extend(d[suite][component]["all"][packagetype])
                         write_filelist(suite, component, arch, packagetype, filelist,
                                        packages, dislocated_files)
-        else: # legacy-mixed suite
-            filelist = []
-            for component in d[suite].keys():
-                for arch in d[suite][component].keys():
-                    for packagetype in d[suite][component][arch].keys():
-                        filelist.extend(d[suite][component][arch][packagetype])
-            write_legacy_mixed_filelist(suite, filelist, packages, dislocated_files)
+        else: # something broken
+            utils.warn("Suite %s has no components." % (suite))
 
 ################################################################################