X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fmake_suite_file_list.py;h=8bb9142c21c58723480c78d3504b98ae142bb31c;hb=b612f3da207fa0d75a5d3b204ac8f02bb244231a;hp=9836560d7e88940a5732c99cabc81484bf619784;hpb=ea17738cea735d71766bfc2bd082f59b3adf2dbb;p=dak.git diff --git a/dak/make_suite_file_list.py b/dak/make_suite_file_list.py index 9836560d..8bb9142c 100755 --- a/dak/make_suite_file_list.py +++ b/dak/make_suite_file_list.py @@ -1,7 +1,11 @@ #!/usr/bin/env python -# Generate file lists used by apt-ftparchive to generate Packages and Sources files -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006 James Troup +""" +Generate file lists used by apt-ftparchive to generate Packages and Sources files +@contact: Debian FTP Master +@copyright: 2000, 2001, 2002, 2003, 2004, 2006 James Troup +@license: GNU General Public License version 2 or later +""" # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -33,19 +37,21 @@ ################################################################################ -import copy, os, pg, sys +import copy +import os +import pg +import sys import apt_pkg -import symlink_dists -import daklib.database -import daklib.logging -import daklib.utils +from daklib import database +from daklib import logging +from daklib import utils ################################################################################ -projectB = None -Cnf = None -Logger = None -Options = None +Cnf = None #: Configuration, apt_pkg.Configuration +projectB = None #: database connection, pgobject +Logger = None #: Logger object +Options = None #: Parsed CommandLine arguments ################################################################################ @@ -77,15 +83,15 @@ def version_cmp(a, b): def delete_packages(delete_versions, pkg, dominant_arch, suite, dominant_version, delete_table, delete_col, packages): - suite_id = daklib.database.get_suite_id(suite) + suite_id = database.get_suite_id(suite) for version in delete_versions: delete_unique_id = version[1] if not packages.has_key(delete_unique_id): continue delete_version = version[0] - delete_id = packages[delete_unique_id]["id"] + delete_id = packages[delete_unique_id]["sourceid"] delete_arch = packages[delete_unique_id]["arch"] - if not Cnf.Find("Suite::%s::Untouchable" % (suite)) or Options["Force"]: + if not database.get_suite_untouchable(suite) or Options["Force"]: if Options["No-Delete"]: print "Would delete %s_%s_%s in %s in favour of %s_%s" % (pkg, delete_arch, delete_version, suite, dominant_version, dominant_arch) else: @@ -100,8 +106,8 @@ def delete_packages(delete_versions, pkg, dominant_arch, suite, ##################################################### -# Per-suite&pkg: resolve arch-all, vs. arch-any, assumes only one arch-all def resolve_arch_all_vs_any(versions, packages): + """ Per-suite&pkg: resolve arch-all, vs. arch-any, assumes only one arch-all """ arch_all_version = None arch_any_versions = copy.copy(versions) for i in arch_any_versions: @@ -132,8 +138,8 @@ def resolve_arch_all_vs_any(versions, packages): ##################################################### -# Per-suite&pkg&arch: resolve duplicate versions def remove_duplicate_versions(versions, packages): + """ Per-suite&pkg&arch: resolve duplicate versions """ # Sort versions into descending order versions.sort(version_cmp) dominant_versions = versions[0] @@ -196,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 = daklib.utils.open_file(filename, "w") - # Generate the final list of files - files = {} - for id in list: - path = packages[id]["path"] - filename = packages[id]["filename"] - file_id = packages[id]["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): - daklib.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 file in keys: - output.write(file+'\n') - output.close() - -############################################################ - def write_filelist(suite, component, arch, type, list, packages, dislocated_files): # Work out the filename if arch != "source": @@ -232,20 +210,20 @@ def write_filelist(suite, component, arch, type, list, packages, dislocated_file elif type == "deb": arch = "binary-%s" % (arch) filename = os.path.join(Cnf["Dir::Lists"], "%s_%s_%s.list" % (suite, component, arch)) - output = daklib.utils.open_file(filename, "w") + output = utils.open_file(filename, "w") # Generate the final list of files files = {} - for id in list: - path = packages[id]["path"] - filename = packages[id]["filename"] - file_id = packages[id]["file_id"] - pkg = packages[id]["pkg"] + for fileid in list: + path = packages[fileid]["path"] + filename = packages[fileid]["filename"] + file_id = packages[fileid]["file_id"] + pkg = packages[fileid]["pkg"] if suite == "stable" and dislocated_files.has_key(file_id): filename = dislocated_files[file_id] else: filename = path + filename if files.has_key(pkg): - daklib.utils.warn("%s (in %s/%s, %s) is duplicated." % (pkg, suite, component, filename)) + utils.warn("%s (in %s/%s, %s) is duplicated." % (pkg, suite, component, filename)) else: files[pkg] = filename # Sort the files since apt-ftparchive doesn't @@ -265,25 +243,24 @@ def write_filelists(packages, dislocated_files): suite = packages[unique_id]["suite"] component = packages[unique_id]["component"] arch = packages[unique_id]["arch"] - type = packages[unique_id]["type"] + packagetype = packages[unique_id]["filetype"] d.setdefault(suite, {}) d[suite].setdefault(component, {}) d[suite][component].setdefault(arch, {}) - d[suite][component][arch].setdefault(type, []) - d[suite][component][arch][type].append(unique_id) + d[suite][component][arch].setdefault(packagetype, []) + d[suite][component][arch][packagetype].append(unique_id) # Flesh out the index if not Options["Suite"]: suites = Cnf.SubTree("Suite").List() else: - suites = daklib.utils.split_args(Options["Suite"]) + suites = utils.split_args(Options["Suite"]) for suite in [ i.lower() for i in suites ]: d.setdefault(suite, {}) if not Options["Component"]: components = Cnf.ValueList("Suite::%s::Components" % (suite)) else: - components = daklib.utils.split_args(Options["Component"]) + components = utils.split_args(Options["Component"]) udeb_components = Cnf.ValueList("Suite::%s::UdebComponents" % (suite)) - udeb_components = udeb_components for component in components: d[suite].setdefault(component, {}) if component in udeb_components: @@ -291,17 +268,17 @@ def write_filelists(packages, dislocated_files): else: binary_types = [ "deb" ] if not Options["Architecture"]: - architectures = Cnf.ValueList("Suite::%s::Architectures" % (suite)) + architectures = database.get_suite_architectures(suite) else: - architectures = daklib.utils.split_args(Options["Architectures"]) + architectures = utils.split_args(Options["Architectures"]) for arch in [ i.lower() for i in architectures ]: d[suite][component].setdefault(arch, {}) if arch == "source": types = [ "dsc" ] else: types = binary_types - for type in types: - d[suite][component][arch].setdefault(type, []) + for packagetype in types: + d[suite][component][arch].setdefault(packagetype, []) # Then walk it for suite in d.keys(): if Cnf.has_key("Suite::%s::Components" % (suite)): @@ -309,46 +286,20 @@ def write_filelists(packages, dislocated_files): for arch in d[suite][component].keys(): if arch == "all": continue - for type in d[suite][component][arch].keys(): - list = d[suite][component][arch][type] + for packagetype in d[suite][component][arch].keys(): + filelist = d[suite][component][arch][packagetype] # If it's a binary, we need to add in the arch: all debs too if arch != "source": archall_suite = Cnf.get("Make-Suite-File-List::ArchAllMap::%s" % (suite)) if archall_suite: - list.extend(d[archall_suite][component]["all"][type]) + filelist.extend(d[archall_suite][component]["all"][packagetype]) elif d[suite][component].has_key("all") and \ - d[suite][component]["all"].has_key(type): - list.extend(d[suite][component]["all"][type]) - write_filelist(suite, component, arch, type, list, + d[suite][component]["all"].has_key(packagetype): + filelist.extend(d[suite][component]["all"][packagetype]) + write_filelist(suite, component, arch, packagetype, filelist, packages, dislocated_files) - else: # legacy-mixed suite - list = [] - for component in d[suite].keys(): - for arch in d[suite][component].keys(): - for type in d[suite][component][arch].keys(): - list.extend(d[suite][component][arch][type]) - write_legacy_mixed_filelist(suite, list, packages, dislocated_files) - -################################################################################ - -# Want to use stable dislocation support: True or false? -def stable_dislocation_p(): - # If the support is not explicitly enabled, assume it's disabled - if not Cnf.FindB("Dinstall::StableDislocationSupport"): - return 0 - # If we don't have a stable suite, obviously a no-op - if not Cnf.has_key("Suite::Stable"): - return 0 - # If the suite(s) weren't explicitly listed, all suites are done - if not Options["Suite"]: - return 1 - # Otherwise, look in what suites the user specified - suites = daklib.utils.split_args(Options["Suite"]) - - if "stable" in suites: - return 1 - else: - return 0 + else: # something broken + utils.warn("Suite %s has no components." % (suite)) ################################################################################ @@ -356,21 +307,18 @@ def do_da_do_da(): # If we're only doing a subset of suites, ensure we do enough to # be able to do arch: all mapping. if Options["Suite"]: - suites = daklib.utils.split_args(Options["Suite"]) + suites = utils.split_args(Options["Suite"]) for suite in suites: archall_suite = Cnf.get("Make-Suite-File-List::ArchAllMap::%s" % (suite)) if archall_suite and archall_suite not in suites: - daklib.utils.warn("Adding %s as %s maps Arch: all from it." % (archall_suite, suite)) + utils.warn("Adding %s as %s maps Arch: all from it." % (archall_suite, suite)) suites.append(archall_suite) Options["Suite"] = ",".join(suites) - + (con_suites, con_architectures, con_components, check_source) = \ - daklib.utils.parse_args(Options) + utils.parse_args(Options) - if stable_dislocation_p(): - dislocated_files = symlink_dists.find_dislocated_stable(Cnf, projectB) - else: - dislocated_files = {} + dislocated_files = {} query = """ SELECT b.id, b.package, a.arch_string, b.version, l.path, f.filename, c.name, @@ -394,13 +342,13 @@ SELECT s.id, s.source, 'source', s.version, l.path, f.filename, c.name, f.id, packages = {} unique_id = 0 for i in ql: - (id, pkg, arch, version, path, filename, component, file_id, suite, type) = i + (sourceid, pkg, arch, version, path, filename, component, file_id, suite, filetype) = i # 'id' comes from either 'binaries' or 'source', so it's not unique unique_id += 1 - packages[unique_id] = Dict(id=id, 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, type = type) + suite=suite, filetype = filetype) cleanup(packages) write_filelists(packages, dislocated_files) @@ -409,24 +357,24 @@ SELECT s.id, s.source, 'source', s.version, l.path, f.filename, c.name, f.id, def main(): global Cnf, projectB, Options, Logger - Cnf = daklib.utils.get_conf() + Cnf = utils.get_conf() Arguments = [('a', "architecture", "Make-Suite-File-List::Options::Architecture", "HasArg"), ('c', "component", "Make-Suite-File-List::Options::Component", "HasArg"), ('h', "help", "Make-Suite-File-List::Options::Help"), ('n', "no-delete", "Make-Suite-File-List::Options::No-Delete"), - ('f', "force", "Make-Suite-File-List::Options::Force"), + ('f', "force", "Make-Suite-File-List::Options::Force"), ('s', "suite", "Make-Suite-File-List::Options::Suite", "HasArg")] - for i in ["architecture", "component", "help", "no-delete", "suite", "force-touch" ]: - if not Cnf.has_key("Make-Suite-File-List::Options::%s" % (i)): - Cnf["Make-Suite-File-List::Options::%s" % (i)] = "" + for i in ["architecture", "component", "help", "no-delete", "suite", "force" ]: + if not Cnf.has_key("Make-Suite-File-List::Options::%s" % (i)): + Cnf["Make-Suite-File-List::Options::%s" % (i)] = "" apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) Options = Cnf.SubTree("Make-Suite-File-List::Options") if Options["Help"]: usage() projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])) - daklib.database.init(Cnf, projectB) - Logger = daklib.logging.Logger(Cnf, "make-suite-file-list") + database.init(Cnf, projectB) + Logger = logging.Logger(Cnf, "make-suite-file-list") do_da_do_da() Logger.close()