X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fmake_suite_file_list.py;h=41e6cb33b9765a699ae488db77eab7bc942b097e;hb=1fce382846c9a7d1e55fda54501aa09872a1ed37;hp=20fe186c5914376a08e30cd6181a2158f5b4d1f5;hpb=e2ae71066cbb134753d7bfceb16e87d0b76dfd6e;p=dak.git diff --git a/dak/make_suite_file_list.py b/dak/make_suite_file_list.py index 20fe186c..41e6cb33 100755 --- a/dak/make_suite_file_list.py +++ b/dak/make_suite_file_list.py @@ -33,12 +33,11 @@ ################################################################################ -import copy, os, pg, string, sys +import copy, os, pg, 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 ################################################################################ @@ -59,6 +58,7 @@ Write out file lists suitable for use with apt-ftparchive. -a, --architecture=ARCH only write file lists for this architecture -c, --component=COMPONENT only write file lists for this component + -f, --force ignore Untouchable suite directives in dak.conf -h, --help show this help and exit -n, --no-delete don't delete older versions -s, --suite=SUITE only write file lists for this suite @@ -76,7 +76,7 @@ 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): @@ -84,7 +84,7 @@ def delete_packages(delete_versions, pkg, dominant_arch, suite, delete_version = version[0] delete_id = packages[delete_unique_id]["id"] delete_arch = packages[delete_unique_id]["arch"] - if not Cnf.Find("Suite::%s::Untouchable" % (suite)): + if not Cnf.Find("Suite::%s::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: @@ -198,7 +198,7 @@ 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") + output = utils.open_file(filename, "w") # Generate the final list of files files = {} for id in list: @@ -210,7 +210,7 @@ def write_legacy_mixed_filelist(suite, list, packages, dislocated_files): else: filename = path + filename if files.has_key(filename): - daklib.utils.warn("%s (in %s) is duplicated." % (filename, suite)) + utils.warn("%s (in %s) is duplicated." % (filename, suite)) else: files[filename] = "" # Sort the files since apt-ftparchive doesn't @@ -231,7 +231,7 @@ 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: @@ -244,7 +244,7 @@ def write_filelist(suite, component, arch, type, list, packages, dislocated_file 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 @@ -274,13 +274,13 @@ def write_filelists(packages, dislocated_files): if not Options["Suite"]: suites = Cnf.SubTree("Suite").List() else: - suites = daklib.utils.split_args(Options["Suite"]) - for suite in map(string.lower, suites): + 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: @@ -292,8 +292,8 @@ def write_filelists(packages, dislocated_files): if not Options["Architecture"]: architectures = Cnf.ValueList("Suite::%s::Architectures" % (suite)) else: - architectures = daklib.utils.split_args(Options["Architectures"]) - for arch in map(string.lower, 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" ] @@ -330,46 +330,22 @@ def write_filelists(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 - -################################################################################ - 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, @@ -408,23 +384,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"), ('s', "suite", "Make-Suite-File-List::Options::Suite", "HasArg")] - for i in ["architecture", "component", "help", "no-delete", "suite" ]: - 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()