[dak/security] Use "import daklib.foo as foo" style
---
ChangeLog | 3 ++
dak/make_overrides.py | 26 +++++++-------
dak/make_suite_file_list.py | 36 ++++++++++----------
dak/new_security_install.py | 75 ++++++++++++++++++++++--------------------
4 files changed, 73 insertions(+), 67 deletions(-)
mode change 100644 => 100755 dak/make_overrides.py
mode change 100644 => 100755 dak/make_suite_file_list.py
mode change 100644 => 100755 dak/new_security_install.py
diff --git a/ChangeLog b/ChangeLog
index 4b4d522..aa28d07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/dak/make_overrides.py b/dak/make_overrides.py
old mode 100644
new mode 100755
index 77074ed..77e7bb8
--- a/dak/make_overrides.py
+++ b/dak/make_overrides.py
@@ -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()
diff --git a/dak/make_suite_file_list.py b/dak/make_suite_file_list.py
old mode 100644
new mode 100755
index a63a617..ca4e036
--- a/dak/make_suite_file_list.py
+++ b/dak/make_suite_file_list.py
@@ -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()
diff --git a/dak/new_security_install.py b/dak/new_security_install.py
old mode 100644
new mode 100755
index f2aea52..ca119c8
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -20,7 +20,10 @@
################################################################################
-import daklib.queue, daklib.logging, daklib.utils, daklib.database
+import daklib.queue as queue
+import daklib.logging as logging
+import daklib.utils as utils
+import daklib.database as database
import apt_pkg, os, sys, pwd, time, re, commands
re_taint_free = re.compile(r"^['/;\-\+\.~\s\w]+$");
@@ -37,7 +40,7 @@ srcverarches = {}
def init():
global Cnf, Upload, Options, Logger
- Cnf = daklib.utils.get_conf()
+ Cnf = utils.get_conf()
Cnf["Dinstall::Options::No-Mail"] = "y"
Arguments = [('h', "help", "Security-Install::Options::Help"),
('a', "automatic", "Security-Install::Options::Automatic"),
@@ -69,13 +72,13 @@ def init():
sys.exit(0)
if len(arguments) == 0:
- daklib.utils.fubar("Process what?")
+ utils.fubar("Process what?")
- Upload = daklib.queue.Upload(Cnf)
+ Upload = queue.Upload(Cnf)
if Options["No-Action"]:
Options["Sudo"] = ""
if not Options["Sudo"] and not Options["No-Action"]:
- Logger = Upload.Logger = daklib.logging.Logger(Cnf, "new-security-install")
+ Logger = Upload.Logger = logging.Logger(Cnf, "new-security-install")
return arguments
@@ -97,9 +100,9 @@ def load_args(arguments):
changesfiles = {}
for a in arguments:
if "/" in a:
- daklib.utils.fubar("can only deal with files in the current directory")
+ utils.fubar("can only deal with files in the current directory")
if not a.endswith(".changes"):
- daklib.utils.fubar("not a .changes file: %s" % (a))
+ utils.fubar("not a .changes file: %s" % (a))
Upload.init_vars()
Upload.pkg.changes_file = a
Upload.update_vars()
@@ -111,7 +114,7 @@ def load_args(arguments):
adv_ids = adv_ids.keys()
if len(adv_ids) > 1:
- daklib.utils.fubar("multiple advisories selected: %s" % (", ".join(adv_ids)))
+ utils.fubar("multiple advisories selected: %s" % (", ".join(adv_ids)))
if adv_ids == []:
advisory = None
else:
@@ -171,7 +174,7 @@ def prompt(opts, default):
a = default
while a not in v:
- a = daklib.utils.our_raw_input(p) + default
+ a = utils.our_raw_input(p) + default
a = a[:1].upper()
return v[a]
@@ -192,7 +195,7 @@ def add_changes(extras):
def yes_no(prompt):
if Options["Automatic"]: return True
while 1:
- answer = daklib.utils.our_raw_input(prompt + " ").lower()
+ answer = utils.our_raw_input(prompt + " ").lower()
if answer in "yn":
return answer == "y"
print "Invalid answer; please try again."
@@ -218,9 +221,9 @@ def actually_upload(changes_files):
uploads = {}; # uploads[uri] = file_list
changesfiles = {}; # changesfiles[uri] = file_list
package_list = {} # package_list[source_name][version]
- changes_files.sort(daklib.utils.changes_compare)
+ changes_files.sort(utils.changes_compare)
for changes_file in changes_files:
- changes_file = daklib.utils.validate_changes_file_arg(changes_file)
+ changes_file = utils.validate_changes_file_arg(changes_file)
# Reset variables
components = {}
upload_uris = {}
@@ -239,7 +242,7 @@ def actually_upload(changes_files):
# Build the file list for this .changes file
for file in files.keys():
poolname = os.path.join(Cnf["Dir::Root"], Cnf["Dir::PoolRoot"],
- daklib.utils.poolify(changes["source"], files[file]["component"]),
+ utils.poolify(changes["source"], files[file]["component"]),
file)
file_list.append(poolname)
orig_component = files[file].get("original component", files[file]["component"])
@@ -251,10 +254,10 @@ def actually_upload(changes_files):
upload_uris[upload_uri] = ""
num_upload_uris = len(upload_uris.keys())
if num_upload_uris == 0:
- daklib.utils.fubar("%s: No valid upload URI found from components (%s)."
+ utils.fubar("%s: No valid upload URI found from components (%s)."
% (changes_file, ", ".join(components.keys())))
elif num_upload_uris > 1:
- daklib.utils.fubar("%s: more than one upload URI (%s) from components (%s)."
+ utils.fubar("%s: more than one upload URI (%s) from components (%s)."
% (changes_file, ", ".join(upload_uris.keys()),
", ".join(components.keys())))
upload_uri = upload_uris.keys()[0]
@@ -285,7 +288,7 @@ def actually_upload(changes_files):
if not Options["No-Action"]:
filename = "%s/testing-processed" % (Cnf["Dir::Log"])
- file = daklib.utils.open_file(filename, 'a')
+ file = utils.open_file(filename, 'a')
for source in package_list.keys():
for version in package_list[source].keys():
file.write(" ".join([source, version])+'\n')
@@ -298,7 +301,7 @@ def generate_advisory(template):
updated_pkgs = {}; # updated_pkgs[distro][arch][file] = {path,md5,size}
for arg in changes:
- arg = daklib.utils.validate_changes_file_arg(arg)
+ arg = utils.validate_changes_file_arg(arg)
Upload.pkg.changes_file = arg
Upload.init_vars()
Upload.update_vars()
@@ -319,7 +322,7 @@ def generate_advisory(template):
md5 = files[file]["md5sum"]
size = files[file]["size"]
poolname = Cnf["Dir::PoolRoot"] + \
- daklib.utils.poolify(src, files[file]["component"])
+ utils.poolify(src, files[file]["component"])
if arch == "source" and file.endswith(".dsc"):
dscpoolname = poolname
for suite in suites:
@@ -363,7 +366,7 @@ def generate_advisory(template):
Subst["__BCC__"] = "Bcc: %s" % (Cnf["Dinstall::Bcc"])
adv = ""
- archive = Cnf["Archive::%s::PrimaryMirror" % (daklib.utils.where_am_i())]
+ archive = Cnf["Archive::%s::PrimaryMirror" % (utils.where_am_i())]
for suite in updated_pkgs.keys():
ver = Cnf["Suite::%s::Version" % suite]
if ver != "": ver += " "
@@ -379,7 +382,7 @@ def generate_advisory(template):
arches.sort()
adv += "%s updates are available for %s.\n\n" % (
- suite.capitalize(), daklib.utils.join_with_commas_and(arches))
+ suite.capitalize(), utils.join_with_commas_and(arches))
for a in ["source", "all"] + arches:
if not updated_pkgs[suite].has_key(a):
@@ -404,19 +407,19 @@ def generate_advisory(template):
Subst["__ADVISORY_TEXT__"] = adv
- adv = daklib.utils.TemplateSubst(Subst, template)
+ adv = utils.TemplateSubst(Subst, template)
return adv
def spawn(command):
if not re_taint_free.match(command):
- daklib.utils.fubar("Invalid character in \"%s\"." % (command))
+ utils.fubar("Invalid character in \"%s\"." % (command))
if Options["No-Action"]:
print "[%s]" % (command)
else:
(result, output) = commands.getstatusoutput(command)
if (result != 0):
- daklib.utils.fubar("Invocation of '%s' failed:\n%s\n" % (command, output), result)
+ utils.fubar("Invocation of '%s' failed:\n%s\n" % (command, output), result)
##################### ! ! ! N O T E ! ! ! #####################
@@ -429,7 +432,7 @@ def spawn(command):
def sudo(arg, fn, exit):
if Options["Sudo"]:
if advisory == None:
- daklib.utils.fubar("Must set advisory name")
+ utils.fubar("Must set advisory name")
os.spawnl(os.P_WAIT, "/usr/bin/sudo", "/usr/bin/sudo", "-u", "dak", "-H",
"/usr/local/bin/dak", "new-security-install", "-"+arg, "--", advisory)
else:
@@ -459,7 +462,7 @@ def _do_Approve():
print "Updating file lists for apt-ftparchive..."
spawn("dak make-suite-file-list")
print "Updating Packages and Sources files..."
- spawn("apt-ftparchive generate %s" % (daklib.utils.which_apt_conf_file()))
+ spawn("apt-ftparchive generate %s" % (utils.which_apt_conf_file()))
print "Updating Release files..."
spawn("dak generate-releases")
print "Triggering security mirrors..."
@@ -473,11 +476,11 @@ def _do_Approve():
def do_Disembargo(): sudo("D", _do_Disembargo, True)
def _do_Disembargo():
if os.getcwd() != Cnf["Dir::Queue::Embargoed"].rstrip("/"):
- daklib.utils.fubar("Can only disembargo from %s" % Cnf["Dir::Queue::Embargoed"])
+ utils.fubar("Can only disembargo from %s" % Cnf["Dir::Queue::Embargoed"])
dest = Cnf["Dir::Queue::Unembargoed"]
- emb_q = daklib.database.get_or_set_queue_id("embargoed")
- une_q = daklib.database.get_or_set_queue_id("unembargoed")
+ emb_q = database.get_or_set_queue_id("embargoed")
+ une_q = database.get_or_set_queue_id("unembargoed")
for c in changes:
print "Disembargoing %s" % (c)
@@ -507,14 +510,14 @@ def _do_Disembargo():
Upload.projectB.query("COMMIT WORK")
for file in Upload.pkg.files.keys():
- daklib.utils.copy(file, os.path.join(dest, file))
+ utils.copy(file, os.path.join(dest, file))
os.unlink(file)
for c in changes:
- daklib.utils.copy(c, os.path.join(dest, c))
+ utils.copy(c, os.path.join(dest, c))
os.unlink(c)
k = c[:-8] + ".dak"
- daklib.utils.copy(k, os.path.join(dest, k))
+ utils.copy(k, os.path.join(dest, k))
os.unlink(k)
def do_Reject(): sudo("R", _do_Reject, True)
@@ -564,11 +567,11 @@ def do_DropAdvisory():
def do_Edit():
adv_file = "./advisory.%s" % (advisory)
if not os.path.exists(adv_file):
- daklib.utils.copy(Cnf["Dir::Templates"]+"/security-install.advisory", adv_file)
+ utils.copy(Cnf["Dir::Templates"]+"/security-install.advisory", adv_file)
editor = os.environ.get("EDITOR", "vi")
result = os.system("%s %s" % (editor, adv_file))
if result != 0:
- daklib.utils.fubar("%s invocation failed for %s." % (editor, adv_file))
+ utils.fubar("%s invocation failed for %s." % (editor, adv_file))
def do_Show():
adv_file = "./advisory.%s" % (advisory)
@@ -604,10 +607,10 @@ def main():
add_changes(extras)
if not advisory:
- daklib.utils.fubar("Must specify an advisory id")
+ utils.fubar("Must specify an advisory id")
if not changes:
- daklib.utils.fubar("No changes specified")
+ utils.fubar("No changes specified")
if Options["Approve"]:
advisory_info()
@@ -649,7 +652,7 @@ def main():
elif what == "Reject":
do_Reject()
else:
- daklib.utils.fubar("Impossible answer '%s', wtf?" % (what))
+ utils.fubar("Impossible answer '%s', wtf?" % (what))
################################################################################
--
1.5.6.5
Reply to: