Commit 56266b7e authored by Joerg Jaspert's avatar Joerg Jaspert 🇩🇪

Use "import daklib.foo as foo" style

parent ba3d9a19
......@@ -23,6 +23,9 @@
* dak/init_dirs.py: likewise
* dak/ls.py: likewise
* dak/make_maintainers.py: likewise
* dak/make_overrides.py: likewise
* dak/make_suite_file_list.py: likewise
* dak/new_security_install.py: likewise
* dak/check_archive.py (check_files_not_symlinks): Remove
long-time unused and commented code. Import stuff from daklib as
......
......@@ -27,8 +27,8 @@
import pg, sys
import apt_pkg
import daklib.database
import daklib.utils
import daklib.database as database
import daklib.utils as utils
################################################################################
......@@ -50,17 +50,17 @@ Outputs the override tables to text files.
def do_list(output_file, suite, component, otype):
global override
suite_id = daklib.database.get_suite_id(suite)
suite_id = database.get_suite_id(suite)
if suite_id == -1:
daklib.utils.fubar("Suite '%s' not recognised." % (suite))
utils.fubar("Suite '%s' not recognised." % (suite))
component_id = daklib.database.get_component_id(component)
component_id = database.get_component_id(component)
if component_id == -1:
daklib.utils.fubar("Component '%s' not recognised." % (component))
utils.fubar("Component '%s' not recognised." % (component))
otype_id = daklib.database.get_override_type_id(otype)
otype_id = database.get_override_type_id(otype)
if otype_id == -1:
daklib.utils.fubar("Type '%s' not recognised. (Valid types are deb, udeb and dsc)" % (otype))
utils.fubar("Type '%s' not recognised. (Valid types are deb, udeb and dsc)" % (otype))
override.setdefault(suite, {})
override[suite].setdefault(component, {})
......@@ -70,20 +70,20 @@ def do_list(output_file, suite, component, otype):
q = projectB.query("SELECT o.package, s.section, o.maintainer FROM override o, section s WHERE o.suite = %s AND o.component = %s AND o.type = %s AND o.section = s.id ORDER BY s.section, o.package" % (suite_id, component_id, otype_id))
for i in q.getresult():
override[suite][component][otype][i[0]] = i
output_file.write(daklib.utils.result_join(i)+'\n')
output_file.write(utils.result_join(i)+'\n')
else:
q = projectB.query("SELECT o.package, p.priority, s.section, o.maintainer, p.level FROM override o, priority p, section s WHERE o.suite = %s AND o.component = %s AND o.type = %s AND o.priority = p.id AND o.section = s.id ORDER BY s.section, p.level, o.package" % (suite_id, component_id, otype_id))
for i in q.getresult():
i = i[:-1]; # Strip the priority level
override[suite][component][otype][i[0]] = i
output_file.write(daklib.utils.result_join(i)+'\n')
output_file.write(utils.result_join(i)+'\n')
################################################################################
def main ():
global Cnf, projectB, override
Cnf = daklib.utils.get_conf()
Cnf = utils.get_conf()
Arguments = [('h',"help","Make-Overrides::Options::Help")]
for i in [ "help" ]:
if not Cnf.has_key("Make-Overrides::Options::%s" % (i)):
......@@ -94,7 +94,7 @@ def main ():
usage()
projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
daklib.database.init(Cnf, projectB)
database.init(Cnf, projectB)
for suite in Cnf.SubTree("Check-Overrides::OverrideSuites").List():
if Cnf.has_key("Suite::%s::Untouchable" % suite) and Cnf["Suite::%s::Untouchable" % suite] != 0:
......@@ -116,7 +116,7 @@ def main ():
elif otype == "dsc":
suffix = ".src"
filename = "%s/override.%s.%s%s" % (Cnf["Dir::Override"], override_suite, component, suffix)
output_file = daklib.utils.open_file(filename, 'w')
output_file = utils.open_file(filename, 'w')
do_list(output_file, suite, component, otype)
output_file.close()
......
......@@ -36,9 +36,9 @@
import copy, os, pg, sys
import apt_pkg
import symlink_dists
import daklib.database
import daklib.logging
import daklib.utils
import daklib.database as database
import daklib.logging as logging
import daklib.utils as utils
################################################################################
......@@ -77,7 +77,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):
......@@ -199,7 +199,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:
......@@ -211,7 +211,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
......@@ -232,7 +232,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:
......@@ -245,7 +245,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
......@@ -275,13 +275,13 @@ def write_filelists(packages, dislocated_files):
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:
......@@ -293,7 +293,7 @@ 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"])
architectures = utils.split_args(Options["Architectures"])
for arch in [ i.lower() for i in architectures ]:
d[suite][component].setdefault(arch, {})
if arch == "source":
......@@ -343,7 +343,7 @@ def stable_dislocation_p():
if not Options["Suite"]:
return 1
# Otherwise, look in what suites the user specified
suites = daklib.utils.split_args(Options["Suite"])
suites = utils.split_args(Options["Suite"])
if "stable" in suites:
return 1
......@@ -356,16 +356,16 @@ 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)
......@@ -409,7 +409,7 @@ 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"),
......@@ -425,8 +425,8 @@ def main():
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()
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment