[dak/security] Cleanup
---
ChangeLog | 2 ++
dak/clean_proposed_updates.py | 38 +++++++++++++++++++-------------------
dak/clean_queues.py | 24 ++++++++++++------------
3 files changed, 33 insertions(+), 31 deletions(-)
mode change 100644 => 100755 dak/clean_proposed_updates.py
mode change 100644 => 100755 dak/clean_queues.py
diff --git a/ChangeLog b/ChangeLog
index 6178c27..b5c129b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* dak/check_proposed_updates.py: Import stuff from daklib as
"import daklib.foo as foo"
+ * dak/clean_proposed_updates.py: likewise
+ * dak/clean_queues.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/clean_proposed_updates.py b/dak/clean_proposed_updates.py
old mode 100644
new mode 100755
index 45812b5..fc063dd
--- a/dak/clean_proposed_updates.py
+++ b/dak/clean_proposed_updates.py
@@ -21,8 +21,8 @@
import os, pg, re, sys
import apt_pkg
-import daklib.database
-import daklib.utils
+import daklib.database as database
+import daklib.utils as utils
################################################################################
@@ -49,14 +49,14 @@ Need either changes files or an admin.txt file with a '.joey' suffix."""
def check_changes (filename):
try:
- changes = daklib.utils.parse_changes(filename)
- files = daklib.utils.build_file_list(changes)
+ changes = utils.parse_changes(filename)
+ files = utils.build_file_list(changes)
except:
- daklib.utils.warn("Couldn't read changes file '%s'." % (filename))
+ utils.warn("Couldn't read changes file '%s'." % (filename))
return
num_files = len(files.keys())
for f in files.keys():
- if daklib.utils.re_isadeb.match(f):
+ if utils.re_isadeb.match(f):
m = re_isdeb.match(f)
pkg = m.group(1)
version = m.group(2)
@@ -64,7 +64,7 @@ def check_changes (filename):
if Options["debug"]:
print "BINARY: %s ==> %s_%s_%s" % (f, pkg, version, arch)
else:
- m = daklib.utils.re_issource.match(f)
+ m = utils.re_issource.match(f)
if m:
pkg = m.group(1)
version = m.group(2)
@@ -77,16 +77,16 @@ def check_changes (filename):
if Options["debug"]:
print "SOURCE: %s ==> %s_%s_%s" % (f, pkg, version, arch)
else:
- daklib.utils.fubar("unknown type, fix me")
+ utils.fubar("unknown type, fix me")
if not pu.has_key(pkg):
# FIXME
- daklib.utils.warn("%s doesn't seem to exist in %s?? (from %s [%s])" % (pkg, Options["suite"], f, filename))
+ utils.warn("%s doesn't seem to exist in %s?? (from %s [%s])" % (pkg, Options["suite"], f, filename))
continue
if not pu[pkg].has_key(arch):
# FIXME
- daklib.utils.warn("%s doesn't seem to exist for %s in %s?? (from %s [%s])" % (pkg, arch, Options["suite"], f, filename))
+ utils.warn("%s doesn't seem to exist for %s in %s?? (from %s [%s])" % (pkg, arch, Options["suite"], f, filename))
continue
- pu_version = daklib.utils.re_no_epoch.sub('', pu[pkg][arch])
+ pu_version = utils.re_no_epoch.sub('', pu[pkg][arch])
if pu_version == version:
if Options["verbose"]:
print "%s: ok" % (f)
@@ -100,7 +100,7 @@ def check_changes (filename):
print "%s: no files left, superseded by %s" % (filename, pu_version)
dest = Cnf["Dir::Morgue"] + "/misc/"
if not Options["no-action"]:
- daklib.utils.move(filename, dest)
+ utils.move(filename, dest)
elif new_num_files < num_files:
print "%s: lost files, MWAAP." % (filename)
else:
@@ -110,7 +110,7 @@ def check_changes (filename):
################################################################################
def check_joey (filename):
- f = daklib.utils.open_file(filename)
+ f = utils.open_file(filename)
cwd = os.getcwd()
os.chdir("%s/dists/%s" % (Cnf["Dir::Root"]), Options["suite"])
@@ -120,10 +120,10 @@ def check_joey (filename):
if line.find('install') != -1:
split_line = line.split()
if len(split_line) != 2:
- daklib.utils.fubar("Parse error (not exactly 2 elements): %s" % (line))
+ utils.fubar("Parse error (not exactly 2 elements): %s" % (line))
install_type = split_line[0]
if install_type not in [ "install", "install-u", "sync-install" ]:
- daklib.utils.fubar("Unknown install type ('%s') from: %s" % (install_type, line))
+ utils.fubar("Unknown install type ('%s') from: %s" % (install_type, line))
changes_filename = split_line[1]
if Options["debug"]:
print "Processing %s..." % (changes_filename)
@@ -159,7 +159,7 @@ ORDER BY package, version, arch_string
def main ():
global Cnf, projectB, Options
- Cnf = daklib.utils.get_conf()
+ Cnf = utils.get_conf()
Arguments = [('d', "debug", "Clean-Proposed-Updates::Options::Debug"),
('v', "verbose", "Clean-Proposed-Updates::Options::Verbose"),
@@ -180,10 +180,10 @@ def main ():
if Options["Help"]:
usage(0)
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.")
projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
- daklib.database.init(Cnf, projectB)
+ database.init(Cnf, projectB)
init_pu()
@@ -193,7 +193,7 @@ def main ():
elif f.endswith(".joey"):
check_joey(f)
else:
- daklib.utils.fubar("Unrecognised file type: '%s'." % (f))
+ utils.fubar("Unrecognised file type: '%s'." % (f))
#######################################################################################
diff --git a/dak/clean_queues.py b/dak/clean_queues.py
old mode 100644
new mode 100755
index 178c1ac..30e0baf
--- a/dak/clean_queues.py
+++ b/dak/clean_queues.py
@@ -35,7 +35,7 @@
import os, stat, sys, time
import apt_pkg
-import daklib.utils
+import daklib.utils as utils
################################################################################
@@ -72,7 +72,7 @@ def init ():
if not os.path.exists(del_dir):
os.makedirs(del_dir, 02775)
if not os.path.isdir(del_dir):
- daklib.utils.fubar("%s must be a directory." % (del_dir))
+ utils.fubar("%s must be a directory." % (del_dir))
# Move to the directory to clean
incoming = Options["Incoming"]
@@ -86,10 +86,10 @@ def remove (f):
dest_filename = del_dir + '/' + os.path.basename(f)
# If the destination file exists; try to find another filename to use
if os.path.exists(dest_filename):
- dest_filename = daklib.utils.find_next_free(dest_filename, 10)
- daklib.utils.move(f, dest_filename, 0660)
+ dest_filename = utils.find_next_free(dest_filename, 10)
+ utils.move(f, dest_filename, 0660)
else:
- daklib.utils.warn("skipping '%s', permission denied." % (os.path.basename(f)))
+ utils.warn("skipping '%s', permission denied." % (os.path.basename(f)))
# Removes any old files.
# [Used for Incoming/REJECT]
@@ -125,20 +125,20 @@ def flush_orphans ():
# Proces all .changes and .dsc files.
for changes_filename in changes_files:
try:
- changes = daklib.utils.parse_changes(changes_filename)
- files = daklib.utils.build_file_list(changes)
+ changes = utils.parse_changes(changes_filename)
+ files = utils.build_file_list(changes)
except:
- daklib.utils.warn("error processing '%s'; skipping it. [Got %s]" % (changes_filename, sys.exc_type))
+ utils.warn("error processing '%s'; skipping it. [Got %s]" % (changes_filename, sys.exc_type))
continue
dsc_files = {}
for f in files.keys():
if f.endswith(".dsc"):
try:
- dsc = daklib.utils.parse_changes(f)
- dsc_files = daklib.utils.build_file_list(dsc, is_a_dsc=1)
+ dsc = utils.parse_changes(f)
+ dsc_files = utils.build_file_list(dsc, is_a_dsc=1)
except:
- daklib.utils.warn("error processing '%s'; skipping it. [Got %s]" % (f, sys.exc_type))
+ utils.warn("error processing '%s'; skipping it. [Got %s]" % (f, sys.exc_type))
continue
# Ensure all the files we've seen aren't deleted
@@ -170,7 +170,7 @@ def flush_orphans ():
def main ():
global Cnf, Options
- Cnf = daklib.utils.get_conf()
+ Cnf = utils.get_conf()
for i in ["Help", "Incoming", "No-Action", "Verbose" ]:
if not Cnf.has_key("Clean-Queues::Options::%s" % (i)):
--
1.5.6.5
Reply to: