Merge commit 'mhy/master' into merge

[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 de62adb9909774baa728b3e37b8fe9ede68d0629..3c690a510960b42da5e9d8a36a4d9952bc7c5a84 100755 (executable)
--- a/dak/make_suite_file_list.py
+++ b/dak/make_suite_file_list.py
@@ -139,7 +139,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 +157,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 +180,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():
@@ -275,7 +275,7 @@ def write_filelists(packages, dislocated_files, session):
             if not Options["Architecture"]:
                 architectures = [ a.arch_string for a in get_suite_architectures(suite, session=session) ]
             else:
-                architectures = utils.split_args(Options["Architectures"])
+                architectures = utils.split_args(Options["Architecture"])
             for arch in [ i.lower() for i in architectures ]:
                 d[suite][component].setdefault(arch, {})
                 if arch == "source":