X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fmake_suite_file_list.py;h=3c690a510960b42da5e9d8a36a4d9952bc7c5a84;hb=96dc94f0c4c645e26b545bc724075063da28c006;hp=096098bfb9cabb6456efdeb35490059e7abc7f70;hpb=9fa241c825a40bd09bd1c2e6b7f065f4a1dc0481;p=dak.git diff --git a/dak/make_suite_file_list.py b/dak/make_suite_file_list.py index 096098bf..3c690a51 100755 --- 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():