[dak/security] Use "import daklib.foo as foo" style
---
ChangeLog | 1 +
dak/rm.py | 84 ++++++++++++++++++++++++++++++------------------------------
2 files changed, 43 insertions(+), 42 deletions(-)
mode change 100644 => 100755 dak/rm.py
diff --git a/ChangeLog b/ChangeLog
index dbc4fd7..1db7a27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,7 @@
* dak/process_accepted.py: likewise
* dak/process_new.py: likewise
* dak/process_unchecked.py: likewise
+ * dak/rm.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/rm.py b/dak/rm.py
old mode 100644
new mode 100755
index 262039b..d5663e3
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -41,8 +41,8 @@
import commands, os, pg, re, sys
import apt_pkg, apt_inst
-import daklib.database
-import daklib.utils
+import daklib.database as database
+import daklib.utils as utils
################################################################################
@@ -87,7 +87,7 @@ ARCH, BUG#, COMPONENT and SUITE can be comma (or space) separated lists, e.g.
# the fuck are we gonna do now? What are we gonna do?"
def game_over():
- answer = daklib.utils.our_raw_input("Continue (y/N)? ").lower()
+ answer = utils.our_raw_input("Continue (y/N)? ").lower()
if answer != "y":
print "Aborted."
sys.exit(1)
@@ -107,11 +107,11 @@ def reverse_depends_check(removals, suites):
for component in components:
filename = "%s/dists/%s/%s/binary-%s/Packages.gz" % (Cnf["Dir::Root"], suites[0], component, architecture)
# apt_pkg.ParseTagFile needs a real file handle and can't handle a GzipFile instance...
- temp_filename = daklib.utils.temp_filename()
+ temp_filename = utils.temp_filename()
(result, output) = commands.getstatusoutput("gunzip -c %s > %s" % (filename, temp_filename))
if (result != 0):
- daklib.utils.fubar("Gunzip invocation failed!\n%s\n" % (output), result)
- packages = daklib.utils.open_file(temp_filename)
+ utils.fubar("Gunzip invocation failed!\n%s\n" % (output), result)
+ packages = utils.open_file(temp_filename)
Packages = apt_pkg.ParseTagFile(packages)
while Packages.Step():
package = Packages.Section.Find("Package")
@@ -165,19 +165,19 @@ def reverse_depends_check(removals, suites):
what = "%s/%s" % (package, component)
else:
what = "** %s" % (package)
- print "%s has an unsatisfied dependency on %s: %s" % (what, architecture, daklib.utils.pp_deps(dep))
+ print "%s has an unsatisfied dependency on %s: %s" % (what, architecture, utils.pp_deps(dep))
dep_problem = 1
# Check source dependencies (Build-Depends and Build-Depends-Indep)
for component in components:
filename = "%s/dists/%s/%s/source/Sources.gz" % (Cnf["Dir::Root"], suites[0], component)
# apt_pkg.ParseTagFile needs a real file handle and can't handle a GzipFile instance...
- temp_filename = daklib.utils.temp_filename()
+ temp_filename = utils.temp_filename()
result, output = commands.getstatusoutput("gunzip -c %s > %s" % (filename, temp_filename))
if result != 0:
sys.stderr.write("Gunzip invocation failed!\n%s\n" % (output))
sys.exit(result)
- sources = daklib.utils.open_file(temp_filename, "r")
+ sources = utils.open_file(temp_filename, "r")
Sources = apt_pkg.ParseTagFile(sources)
while Sources.Step():
source = Sources.Section.Find("Package")
@@ -202,7 +202,7 @@ def reverse_depends_check(removals, suites):
source = "%s/%s" % (source, component)
else:
source = "** %s" % (source)
- print "%s has an unsatisfied build-dependency: %s" % (source, daklib.utils.pp_deps(dep))
+ print "%s has an unsatisfied build-dependency: %s" % (source, utils.pp_deps(dep))
dep_problem = 1
sources.close()
os.unlink(temp_filename)
@@ -220,7 +220,7 @@ def reverse_depends_check(removals, suites):
def main ():
global Cnf, Options, projectB
- Cnf = daklib.utils.get_conf()
+ Cnf = utils.get_conf()
Arguments = [('h',"help","Rm::Options::Help"),
('a',"architecture","Rm::Options::Architecture", "HasArg"),
@@ -251,19 +251,19 @@ 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)
# Sanity check options
if not arguments:
- daklib.utils.fubar("need at least one package name as an argument.")
+ utils.fubar("need at least one package name as an argument.")
if Options["Architecture"] and Options["Source-Only"]:
- daklib.utils.fubar("can't use -a/--architecutre and -S/--source-only options simultaneously.")
+ utils.fubar("can't use -a/--architecutre and -S/--source-only options simultaneously.")
if Options["Binary-Only"] and Options["Source-Only"]:
- daklib.utils.fubar("can't use -b/--binary-only and -S/--source-only options simultaneously.")
+ utils.fubar("can't use -b/--binary-only and -S/--source-only options simultaneously.")
if Options.has_key("Carbon-Copy") and not Options.has_key("Done"):
- daklib.utils.fubar("can't use -C/--carbon-copy without also using -d/--done option.")
+ utils.fubar("can't use -C/--carbon-copy without also using -d/--done option.")
if Options["Architecture"] and not Options["Partial"]:
- daklib.utils.warn("-a/--architecture implies -p/--partial.")
+ utils.warn("-a/--architecture implies -p/--partial.")
Options["Partial"] = "true"
# Force the admin to tell someone if we're not doing a 'dak
@@ -271,7 +271,7 @@ def main ():
# as telling someone).
if not Options["No-Action"] and not Options["Carbon-Copy"] \
and not Options["Done"] and Options["Reason"].find("[auto-cruft]") == -1:
- daklib.utils.fubar("Need a -C/--carbon-copy if not closing a bug and not doing a cruft removal.")
+ utils.fubar("Need a -C/--carbon-copy if not closing a bug and not doing a cruft removal.")
# Process -C/--carbon-copy
#
@@ -281,7 +281,7 @@ def main ():
# 3) contains a '@' - assumed to be an email address, used unmofidied
#
carbon_copy = []
- for copy_to in daklib.utils.split_args(Options.get("Carbon-Copy")):
+ for copy_to in utils.split_args(Options.get("Carbon-Copy")):
if copy_to.isdigit():
carbon_copy.append(copy_to + "@" + Cnf["Dinstall::BugServer"])
elif copy_to == 'package':
@@ -292,7 +292,7 @@ def main ():
elif '@' in copy_to:
carbon_copy.append(copy_to)
else:
- daklib.utils.fubar("Invalid -C/--carbon-copy argument '%s'; not a bug number, 'package' or email address." % (copy_to))
+ utils.fubar("Invalid -C/--carbon-copy argument '%s'; not a bug number, 'package' or email address." % (copy_to))
if Options["Binary-Only"]:
field = "b.package"
@@ -301,15 +301,15 @@ def main ():
con_packages = "AND %s IN (%s)" % (field, ", ".join([ repr(i) for i in arguments ]))
(con_suites, con_architectures, con_components, check_source) = \
- daklib.utils.parse_args(Options)
+ utils.parse_args(Options)
# Additional suite checks
suite_ids_list = []
- suites = daklib.utils.split_args(Options["Suite"])
- suites_list = daklib.utils.join_with_commas_and(suites)
+ suites = utils.split_args(Options["Suite"])
+ suites_list = utils.join_with_commas_and(suites)
if not Options["No-Action"]:
for suite in suites:
- suite_id = daklib.database.get_suite_id(suite)
+ suite_id = database.get_suite_id(suite)
if suite_id != -1:
suite_ids_list.append(suite_id)
if suite == "stable":
@@ -325,7 +325,7 @@ def main ():
# Additional architecture checks
if Options["Architecture"] and check_source:
- daklib.utils.warn("'source' in -a/--argument makes no sense and is ignored.")
+ utils.warn("'source' in -a/--argument makes no sense and is ignored.")
# Additional component processing
over_con_components = con_components.replace("c.id", "component")
@@ -363,9 +363,9 @@ def main ():
for i in source_packages.keys():
filename = "/".join(source_packages[i])
try:
- dsc = daklib.utils.parse_changes(filename)
- except daklib.utils.cant_open_exc:
- daklib.utils.warn("couldn't open '%s'." % (filename))
+ dsc = utils.parse_changes(filename)
+ except utils.cant_open_exc:
+ utils.warn("couldn't open '%s'." % (filename))
continue
for package in dsc.get("binary").split(','):
package = package.strip()
@@ -378,7 +378,7 @@ def main ():
q = projectB.query("SELECT l.path, f.filename, b.package, b.version, a.arch_string, b.id, b.maintainer FROM binaries b, bin_associations ba, architecture a, suite su, files f, location l, component c WHERE ba.bin = b.id AND ba.suite = su.id AND b.architecture = a.id AND b.file = f.id AND f.location = l.id AND l.component = c.id %s %s %s AND b.package = '%s'" % (con_suites, con_components, con_architectures, package))
for i in q.getresult():
filename = "/".join(i[:2])
- control = apt_pkg.ParseSection(apt_inst.debExtractControl(daklib.utils.open_file(filename)))
+ control = apt_pkg.ParseSection(apt_inst.debExtractControl(utils.open_file(filename)))
source = control.Find("Source", control.Find("Package"))
source = re_strip_source_version.sub('', source)
if source_packages.has_key(source):
@@ -392,12 +392,12 @@ def main ():
# If we don't have a reason; spawn an editor so the user can add one
# Write the rejection email out as the <foo>.reason file
if not Options["Reason"] and not Options["No-Action"]:
- temp_filename = daklib.utils.temp_filename()
+ temp_filename = utils.temp_filename()
editor = os.environ.get("EDITOR","vi")
result = os.system("%s %s" % (editor, temp_filename))
if result != 0:
- daklib.utils.fubar ("vi invocation failed for `%s'!" % (temp_filename), result)
- temp_file = daklib.utils.open_file(temp_filename)
+ utils.fubar ("vi invocation failed for `%s'!" % (temp_filename), result)
+ temp_file = utils.open_file(temp_filename)
for line in temp_file.readlines():
Options["Reason"] += line
temp_file.close()
@@ -420,7 +420,7 @@ def main ():
maintainer_list = []
for maintainer_id in maintainers.keys():
- maintainer_list.append(daklib.database.get_maintainer(maintainer_id))
+ maintainer_list.append(database.get_maintainer(maintainer_id))
summary = ""
removals = d.keys()
removals.sort()
@@ -428,7 +428,7 @@ def main ():
versions = d[package].keys()
versions.sort(apt_pkg.VersionCompare)
for version in versions:
- d[package][version].sort(daklib.utils.arch_compare_sw)
+ d[package][version].sort(utils.arch_compare_sw)
summary += "%10s | %10s | %s\n" % (package, version, ", ".join(d[package][version]))
print "Will remove the following packages from %s:" % (suites_list)
print
@@ -454,11 +454,11 @@ def main ():
print "Going to remove the packages now."
game_over()
- whoami = daklib.utils.whoami()
+ whoami = utils.whoami()
date = commands.getoutput('date -R')
# Log first; if it all falls apart I want a record that we at least tried.
- logfile = daklib.utils.open_file(Cnf["Rm::LogFile"], 'a')
+ logfile = utils.open_file(Cnf["Rm::LogFile"], 'a')
logfile.write("=========================================================================\n")
logfile.write("[Date: %s] [ftpmaster: %s]\n" % (date, whoami))
logfile.write("Removed the following packages from %s:\n\n%s" % (suites_list, summary))
@@ -468,8 +468,8 @@ def main ():
logfile.write("----------------------------------------------\n")
logfile.flush()
- dsc_type_id = daklib.database.get_override_type_id('dsc')
- deb_type_id = daklib.database.get_override_type_id('deb')
+ dsc_type_id = database.get_override_type_id('dsc')
+ deb_type_id = database.get_override_type_id('deb')
# Do the actual deletion
print "Deleting...",
@@ -518,14 +518,14 @@ def main ():
Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"]
Subst["__DISTRO__"] = Cnf["Dinstall::MyDistribution"]
Subst["__WHOAMI__"] = whoami
- whereami = daklib.utils.where_am_i()
+ whereami = utils.where_am_i()
Archive = Cnf.SubTree("Archive::%s" % (whereami))
Subst["__MASTER_ARCHIVE__"] = Archive["OriginServer"]
Subst["__PRIMARY_MIRROR__"] = Archive["PrimaryMirror"]
- for bug in daklib.utils.split_args(Options["Done"]):
+ for bug in utils.split_args(Options["Done"]):
Subst["__BUG_NUMBER__"] = bug
- mail_message = daklib.utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/rm.bug-close")
- daklib.utils.send_mail(mail_message)
+ mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/rm.bug-close")
+ utils.send_mail(mail_message)
logfile.write("=========================================================================\n")
logfile.close()
--
1.5.6.5
Reply to: