Really replace msfl by dominate in dinstall

[dak.git] / dak / make_suite_file_list.py

diff --git a/dak/make_suite_file_list.py b/dak/make_suite_file_list.py
index 096098bfb9cabb6456efdeb35490059e7abc7f70..8c13100998eb6b651d86358e720e654eb73dbc8d 100755 (executable)
--- a/dak/make_suite_file_list.py
+++ b/dak/make_suite_file_list.py
@@ -54,10 +54,6 @@ Options = None  #: Parsed CommandLine arguments
 
 ################################################################################
 
-def Dict(**dict): return dict
-
-################################################################################
-
 def usage (exit_code=0):
     print """Usage: dak make-suite-file-list [OPTION]
 Write out file lists suitable for use with apt-ftparchive.
@@ -139,7 +135,7 @@ def resolve_arch_all_vs_any(versions, packages, session):
 
 #####################################################
 
-def remove_duplicate_versions(versions, packages):
+def remove_duplicate_versions(versions, packages, session):
     """ Per-suite&pkg&arch: resolve duplicate versions """
     # Sort versions into descending order
     versions.sort(version_cmp)
@@ -157,7 +153,7 @@ def remove_duplicate_versions(versions, packages):
         delete_col = "bin"
     # Remove all but the highest
     delete_packages(dominated_versions, pkg, arch, suite,
-                    dominant_version, delete_table, delete_col, packages)
+                    dominant_version, delete_table, delete_col, packages, session)
     return [dominant_versions]
 
 ################################################################################
@@ -180,7 +176,7 @@ def cleanup(packages, session):
             for arch in d[suite][pkg].keys():
                 versions = d[suite][pkg][arch]
                 if len(versions) > 1:
-                    d[suite][pkg][arch] = remove_duplicate_versions(versions, packages)
+                    d[suite][pkg][arch] = remove_duplicate_versions(versions, packages, session)
 
     # Arch: all -> any and vice versa
     for suite in d.keys():
@@ -309,6 +305,8 @@ def write_filelists(packages, dislocated_files, session):
 ################################################################################
 
 def do_da_do_da():
+    cnf = Config()
+
     # If we're only doing a subset of suites, ensure we do enough to
     # be able to do arch: all mapping.
     if Options["Suite"]:
@@ -357,13 +355,15 @@ SELECT s.id, s.source, 'source', s.version, l.path, f.filename, c.name, f.id,
 
         # 'id' comes from either 'binaries' or 'source', so it's not unique
         unique_id += 1
-        packages[unique_id] = Dict(sourceid=sourceid, pkg=pkg, arch=arch, version=version,
+        packages[unique_id] = dict(sourceid=sourceid, pkg=pkg, arch=arch, version=version,
                                    path=path, filename=filename,
                                    component=component, file_id=file_id,
                                    suite=suite, filetype = filetype)
     cleanup(packages, session)
     session.commit()
-    write_filelists(packages, dislocated_files, session)
+
+    # has been replaced by 'dak generate-filelist':
+    #write_filelists(packages, dislocated_files, session)
 
 ################################################################################