import commands, os, pwd, re, sys, time
import apt_pkg
-import dak.lib.queue, dak.lib.utils
+import daklib.queue
+import daklib.utils
################################################################################
uploads = {}; # uploads[uri] = file_list
changesfiles = {}; # changesfiles[uri] = file_list
package_list = {} # package_list[source_name][version]
- changes_files.sort(dak.lib.utils.changes_compare)
+ changes_files.sort(daklib.utils.changes_compare)
for changes_file in changes_files:
- changes_file = dak.lib.utils.validate_changes_file_arg(changes_file)
+ changes_file = daklib.utils.validate_changes_file_arg(changes_file)
# Reset variables
components = {}
upload_uris = {}
if changes["architecture"].has_key("amd64"):
print "Not uploading amd64 part to ftp-master\n"
continue
- if changes["distribution"].has_key("oldstable-security"):
+ if changes["distribution"].has_key("oldstable"):
print "Not uploading oldstable-security changes to ftp-master\n"
continue
# Build the file list for this .changes file
for file in files.keys():
poolname = os.path.join(Cnf["Dir::Root"], Cnf["Dir::PoolRoot"],
- dak.lib.utils.poolify(changes["source"], files[file]["component"]),
+ daklib.utils.poolify(changes["source"], files[file]["component"]),
file)
file_list.append(poolname)
orig_component = files[file].get("original component", files[file]["component"])
upload_uris[upload_uri] = ""
num_upload_uris = len(upload_uris.keys())
if num_upload_uris == 0:
- dak.lib.utils.fubar("%s: No valid upload URI found from components (%s)."
+ daklib.utils.fubar("%s: No valid upload URI found from components (%s)."
% (changes_file, ", ".join(components.keys())))
elif num_upload_uris > 1:
- dak.lib.utils.fubar("%s: more than one upload URI (%s) from components (%s)."
+ daklib.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]
uploads[upload_uri] = []
uploads[upload_uri].extend(file_list)
# Update the changes list for the upload uri
- if not changes.has_key(upload_uri):
+ if not changesfiles.has_key(upload_uri):
changesfiles[upload_uri] = []
changesfiles[upload_uri].append(changes_file)
# Remember the suites and source name/version
if not Options["No-Action"]:
filename = "%s/testing-processed" % (Cnf["Dir::Log"])
- file = dak.lib.utils.open_file(filename, 'a')
+ file = daklib.utils.open_file(filename, 'a')
for source in package_list.keys():
for version in package_list[source].keys():
file.write(" ".join([source, version])+'\n')
updated_pkgs = {}; # updated_pkgs[distro][arch][file] = {path,md5,size}
for arg in changes_files:
- arg = dak.lib.utils.validate_changes_file_arg(arg)
+ arg = daklib.utils.validate_changes_file_arg(arg)
Upload.pkg.changes_file = arg
Upload.init_vars()
Upload.update_vars()
md5 = files[file]["md5sum"]
size = files[file]["size"]
poolname = Cnf["Dir::PoolRoot"] + \
- dak.lib.utils.poolify(src, files[file]["component"])
+ daklib.utils.poolify(src, files[file]["component"])
if arch == "source" and file.endswith(".dsc"):
dscpoolname = poolname
for suite in suites:
Subst["__BCC__"] = "Bcc: %s" % (Cnf["Dinstall::Bcc"])
adv = ""
- archive = Cnf["Archive::%s::PrimaryMirror" % (dak.lib.utils.where_am_i())]
+ archive = Cnf["Archive::%s::PrimaryMirror" % (daklib.utils.where_am_i())]
for suite in updated_pkgs.keys():
suite_header = "%s %s (%s)" % (Cnf["Dinstall::MyDistribution"],
Cnf["Suite::%s::Version" % suite], suite)
arches.sort()
adv += " %s was released for %s.\n\n" % (
- suite.capitalize(), dak.lib.utils.join_with_commas_and(arches))
+ suite.capitalize(), daklib.utils.join_with_commas_and(arches))
for a in ["source", "all"] + arches:
if not updated_pkgs[suite].has_key(a):
Subst["__ADVISORY_TEXT__"] = adv
- adv = dak.lib.utils.TemplateSubst(Subst, Cnf["Dir::Templates"]+"/security-install.advisory")
+ adv = daklib.utils.TemplateSubst(Subst, Cnf["Dir::Templates"]+"/security-install.advisory")
if not Options["No-Action"]:
- dak.lib.utils.send_mail (adv)
+ daklib.utils.send_mail (adv)
else:
print "[<Would send template advisory mail>]"
global Cnf, Upload, Options
apt_pkg.init()
- Cnf = dak.lib.utils.get_conf()
+ Cnf = daklib.utils.get_conf()
Arguments = [('h', "help", "Security-Install::Options::Help"),
('n', "no-action", "Security-Install::Options::No-Action")]
arguments = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
Options = Cnf.SubTree("Security-Install::Options")
- Upload = dak.lib.queue.Upload(Cnf)
+ Upload = daklib.queue.Upload(Cnf)
if Options["Help"]:
usage(0)
advisory_number = arguments[0]
changes_files = arguments[1:]
if advisory_number.endswith(".changes"):
- dak.lib.utils.warn("first argument must be the advisory number.")
+ daklib.utils.warn("first argument must be the advisory number.")
usage(1)
for file in changes_files:
- file = dak.lib.utils.validate_changes_file_arg(file)
+ file = daklib.utils.validate_changes_file_arg(file)
return (advisory_number, changes_files)
######################################################################
def yes_no(prompt):
while 1:
- answer = dak.lib.utils.our_raw_input(prompt+" ").lower()
+ answer = daklib.utils.our_raw_input(prompt+" ").lower()
if answer == "y" or answer == "n":
break
else:
def spawn(command):
if not re_taint_free.match(command):
- dak.lib.utils.fubar("Invalid character in \"%s\"." % (command))
+ daklib.utils.fubar("Invalid character in \"%s\"." % (command))
if Options["No-Action"]:
print "[%s]" % (command)
else:
(result, output) = commands.getstatusoutput(command)
if (result != 0):
- dak.lib.utils.fubar("Invocation of '%s' failed:\n%s\n" % (command, output), result)
+ daklib.utils.fubar("Invocation of '%s' failed:\n%s\n" % (command, output), result)
######################################################################
print "Updating file lists for apt-ftparchive..."
spawn("dak make-suite-file-list")
print "Updating Packages and Sources files..."
- spawn("apt-ftparchive generate %s" % (dak.lib.utils.which_apt_conf_file()))
+ spawn("apt-ftparchive generate %s" % (daklib.utils.which_apt_conf_file()))
print "Updating Release files..."
spawn("dak generate-releases")