# Installs Debian packaes
# Copyright (C) 2000, 2001 James Troup <james@nocrew.org>
-# $Id: katie,v 1.30 2001-03-02 02:36:23 troup Exp $
+# $Id: katie,v 1.40 2001-04-16 17:45:06 troup Exp $
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-# Based (almost entirely) on dinstall by Guy Maor <maor@debian.org>
+# Originally based almost entirely on dinstall by Guy Maor <maor@debian.org>
#########################################################################################
re_fdnic = re.compile("\n\n");
re_bad_diff = re.compile("^[\-\+][\-\+][\-\+] /dev/null");
-###############################################################################
-
-#
-reject_footer = """If you don't understand why your files were rejected, or if the
-override file requires editing, reply to this email.
-
-Your rejected files are in incoming/REJECT/. (Some may also be in
-incoming/ if your .changes file was unparsable.) If only some of the
-files need to repaired, you may move any good files back to incoming/.
-Please remove any bad files from incoming/REJECT/."""
-#
-new_ack_footer = """Your package contains new components which requires manual editing of
-the override file. It is ok otherwise, so please be patient. New
-packages are usually added to the override file about once a week.
-
-You may have gotten the distribution wrong. You'll get warnings above
-if files already exist in other distributions."""
-#
-installed_footer = """If the override file requires editing, file a bug on ftp.debian.org.
-
-Thank you for your contribution to Debian GNU."""
-
#########################################################################################
# Globals
install_bytes = 0.0;
reprocess = 0;
orig_tar_id = None;
+orig_tar_location = "";
legacy_source_untouchable = {};
+Subst = {};
#########################################################################################
-v, --version display the version number and exit"""
sys.exit(exit_code)
+#########################################################################################
+
def check_signature (filename):
global reject_message
global reject_message, changes, files
# Default in case we bail out
- changes["maintainer822"] = Cnf["Dinstall::MyEmailAddress"];
-
+ changes["maintainer822"] = Cnf["Dinstall::MyEmailAddress"];
+ changes["changedby822"] = Cnf["Dinstall::MyEmailAddress"];
+
# Parse the .changes field into a dictionary
try:
changes = utils.parse_changes(filename, 0)
# Fix the Changed-By: field to be RFC822 compatible; if it exists.
(changes["changedby822"], changes["changedbyname"], changes["changedbyemail"]) = utils.fix_maintainer(changes.get("changed-by",""));
- # For source uploads the Changed-By field wins; otherwise Maintainer wins.
- if changes["architecture"].has_key("source"):
- changes["uploader822"] = "To: %s\nCc: %s" % (changes["changedby822"], changes["maintainer822"]);
- # changes["uploadername"], changes["uploaderemail"]) = (changes["changedby822"], changes["changedbyname"], changes["changedbyemail"]);
-
# Ensure all the values in Closes: are numbers
if changes.has_key("closes"):
for i in changes["closes"].keys():
# FIXME: should probably remove anything that != stable
for i in ("frozen", "unstable"):
if changes["distribution"].has_key(i):
- reject_message = reject_message + "Removing %s from distribution list.\n"
+ reject_message = reject_message + "Removing %s from distribution list.\n" % (i)
del changes["distribution"][i]
changes["stable upload"] = 1;
# If we can't find a file from the .changes; assume it's a package already in the pool and move into the pool
###############################################################################
def check_dsc ():
- global dsc, dsc_files, reject_message, reprocess, orig_tar_id, legacy_source_untouchable;
+ global dsc, dsc_files, reject_message, reprocess, orig_tar_id, orig_tar_location, legacy_source_untouchable;
for file in files.keys():
if files[file]["type"] == "dsc":
reject_message = reject_message + "Rejected: can not overwrite existing copy of '%s' already in the archive.\n" % (dsc_file)
elif dsc_file[-12:] == ".orig.tar.gz":
# Check in the pool
- q = projectB.query("SELECT l.path, f.filename, l.type, f.id FROM files f, location l WHERE (f.filename ~ '/%s$' OR f.filename = '%s') AND l.id = f.location" % (utils.regex_safe(dsc_file), dsc_file));
+ q = projectB.query("SELECT l.path, f.filename, l.type, f.id, l.id FROM files f, location l WHERE (f.filename ~ '/%s$' OR f.filename = '%s') AND l.id = f.location" % (utils.regex_safe(dsc_file), dsc_file));
ql = q.getresult();
if ql != []:
suite_type = x[2];
dsc_files[dsc_file]["files id"] = x[3]; # need this for updating dsc_files in install()
# See install()...
+ orig_tar_id = x[3];
if suite_type == "legacy" or suite_type == "legacy-mixed":
- orig_tar_id = x[3];
+ orig_tar_location = "legacy";
+ else:
+ orig_tar_location = x[4];
else:
# Not there? Check in Incoming...
# [See comment above process_it() for explanation
# problem just changed the symptoms.
def check_diff ():
- global dsc, dsc_files, reject_message, reprocess, orig_tar_id;
+ global dsc, dsc_files, reject_message, reprocess;
for filename in files.keys():
if files[filename]["type"] == "diff.gz":
reject_message = reject_message + "Rejected: md5sum check failed for %s.\n" % (file);
def check_override ():
+ global Subst;
+
# Only check section & priority on sourceful uploads
if not changes["architecture"].has_key("source"):
return;
if summary == "":
return;
-
- mail_message = """Return-Path: %s
-From: %s
-To: %s
-Bcc: troup@auric.debian.org
-Subject: %s override disparity
-
-There are disparities between your recently installed upload and the
-override file for the following file(s):
-
-%s
-Either the package or the override file is incorrect. If you think
-the override is correct and the package wrong please fix the package
-so that this disparity is fixed in the next upload. If you feel the
-override is incorrect then please reply to this mail and explain why.
-
---
-Debian distribution maintenance software
-
-(This message was generated automatically; if you believe that there
-is a problem with it please contact the archive administrators by
-mailing ftpmaster@debian.org)
-""" % (Cnf["Dinstall::MyEmailAddress"], Cnf["Dinstall::MyEmailAddress"], changes["maintainer822"], changes["source"], summary);
+
+ Subst["__SUMMARY__"] = summary;
+ mail_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/katie.override-disparity","r").read());
utils.send_mail (mail_message, "")
#####################################################################################################################
+# Set up the per-package template substitution mappings
+
+def update_subst (changes_filename):
+ global Subst;
+
+ if changes.has_key("architecture"):
+ Subst["__ARCHITECTURE__"] = string.join(changes["architecture"].keys(), ' ' );
+ else:
+ Subst["__ARCHITECTURE__"] = "Unknown";
+ Subst["__CHANGES_FILENAME__"] = os.path.basename(changes_filename);
+ Subst["__FILE_CONTENTS__"] = changes.get("filecontents", "");
+
+ # For source uploads the Changed-By field wins; otherwise Maintainer wins.
+ if changes["architecture"].has_key("source") and changes["changedby822"] != "" and (changes["changedby822"] != changes["maintainer822"]):
+ Subst["__MAINTAINER_FROM__"] = changes["changedby822"];
+ Subst["__MAINTAINER_TO__"] = changes["changedby822"] + ", " + changes["maintainer822"];
+ Subst["__MAINTAINER__"] = changes.get("changed-by", "Unknown");
+ else:
+ Subst["__MAINTAINER_FROM__"] = changes["maintainer822"];
+ Subst["__MAINTAINER_TO__"] = changes["maintainer822"];
+ Subst["__MAINTAINER__"] = changes.get("maintainer", "Unknown");
+
+ Subst["__REJECT_MESSAGE__"] = reject_message;
+ Subst["__SOURCE__"] = changes.get("source", "Unknown");
+ Subst["__VERSION__"] = changes.get("version", "Unknown");
+
+#####################################################################################################################
+
def action (changes_filename):
byhand = confirm = suites = summary = new = "";
answer = 'S'
if string.find(reject_message, "Rejected") != -1:
- if time.time()-os.path.getmtime(changes_filename) < 86400:
+ try:
+ modified_time = time.time()-os.path.getmtime(changes_filename);
+ except: # i.e. ignore errors like 'file does not exist';
+ modified_time = 0;
+ if modified_time < 86400:
print "SKIP (too new)\n" + reject_message,;
prompt = "[S]kip, Manual reject, Quit ?";
else:
#####################################################################################################################
def install (changes_filename, summary, short_summary):
- global install_count, install_bytes
+ global install_count, install_bytes, Subst;
# Stable uploads are a special case
if changes.has_key("stable upload"):
architecture = files[file]["architecture"]
architecture_id = db_access.get_architecture_id (architecture);
type = files[file]["dbtype"];
- component = files[file]["component"]
+ dsc_component = files[file]["component"]
source = files[file]["source"]
source_version = ""
if string.find(source, "(") != -1:
# If the .orig.tar.gz is in a legacy directory we need to poolify
# it, so that apt-get source (and anything else that goes by the
# "Directory:" field in the Sources.gz file) works.
- if orig_tar_id != None:
+ if orig_tar_id != None and orig_tar_location == "legacy":
q = projectB.query("SELECT DISTINCT ON (f.id) l.path, f.filename, f.id as files_id, df.source, df.id as dsc_files_id, f.size, f.md5sum FROM files f, dsc_files df, location l WHERE df.source IN (SELECT source FROM dsc_files WHERE file = %s) AND f.id = df.file AND l.id = f.location AND (l.type = 'legacy' OR l.type = 'legacy-mixed')" % (orig_tar_id));
qd = q.dictresult();
for qid in qd:
# Then Update the DB's files table
q = projectB.query("UPDATE files SET filename = '%s', location = '%s' WHERE id = '%s'" % (pool_filename, dsc_location_id, qid["files_id"]));
+ # If this is a sourceful diff only upload that is moving non-legacy
+ # cross-component we need to copy the .orig.tar.gz into the new
+ # component too for the same reasons as above.
+ #
+ if changes["architecture"].has_key("source") and orig_tar_id != None and \
+ orig_tar_location != "legacy" and orig_tar_location != dsc_location_id:
+ q = projectB.query("SELECT l.path, f.filename, f.size, f.md5sum FROM files f, location l WHERE f.id = %s AND f.location = l.id" % (orig_tar_id));
+ ql = q.getresult()[0];
+ old_filename = ql[0] + ql[1];
+ file_size = ql[2];
+ file_md5sum = ql[3];
+ new_filename = utils.poolify (changes["source"], dsc_component) + os.path.basename(old_filename);
+ new_files_id = db_access.get_files_id(new_filename, file_size, file_md5sum, dsc_location_id);
+ if new_files_id == None:
+ utils.copy(old_filename, Cnf["Dir::PoolDir"] + new_filename);
+ new_files_id = db_access.set_files_id(new_filename, file_size, file_md5sum, dsc_location_id);
+ projectB.query("UPDATE dsc_files SET file = %s WHERE source = %s AND file = %s" % (new_files_id, source_id, orig_tar_id));
+
# Install the files into the pool
for file in files.keys():
if files[file].has_key("byhand"):
install_count = install_count + 1;
if not Cnf["Dinstall::Options::No-Mail"]:
- mail_message = """Return-Path: %s
-From: %s
-To: %s
-Bcc: troup@auric.debian.org
-Subject: %s INSTALLED
-
-%s
-Installing:
-%s
-
-%s""" % (Cnf["Dinstall::MyEmailAddress"], Cnf["Dinstall::MyEmailAddress"], changes["maintainer822"], os.path.basename(changes_filename), reject_message, summary, installed_footer)
+ Subst["__SUITE__"] = "";
+ Subst["__SUMMARY__"] = summary;
+ mail_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/katie.installed","r").read());
utils.send_mail (mail_message, "")
announce (short_summary, 1)
check_override ();
#####################################################################################################################
def stable_install (changes_filename, summary, short_summary):
- global install_count, install_bytes
+ global install_count, install_bytes, Subst;
print "Installing to stable."
projectB.query("COMMIT WORK");
- utils.move (changes_filename, Cnf["Rhona::Morgue"] + os.path.basename(changes_filename));
+ # FIXME
+ utils.move (changes_filename, Cnf["Dir::Morgue"] + '/katie/' + os.path.basename(changes_filename));
# Update the Stable ChangeLog file
install_count = install_count + 1;
if not Cnf["Dinstall::Options::No-Mail"]:
- mail_message = """Return-Path: %s
-From: %s
-To: %s
-Bcc: troup@auric.debian.org
-Subject: %s INSTALLED into stable
-
-%s
-Installing:
-%s
-
-%s""" % (Cnf["Dinstall::MyEmailAddress"], Cnf["Dinstall::MyEmailAddress"], changes["maintainer822"], os.path.basename(changes_filename), reject_message, summary, installed_footer)
+ Subst["__SUITE__"] = " into stable";
+ Subst["__SUMMARY__"] = summary;
+ mail_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/katie.installed","r").read());
utils.send_mail (mail_message, "")
announce (short_summary, 1)
#####################################################################################################################
def reject (changes_filename, manual_reject_mail_filename):
+ global Subst;
+
print "Rejecting.\n"
base_changes_filename = os.path.basename(changes_filename);
fd = os.open(reject_filename, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0644);
os.write(fd, reject_message);
os.close(fd);
- reject_mail_message = """From: %s
-To: %s
-Bcc: troup@auric.debian.org
-Subject: %s REJECTED
-
-%s
-===
-%s""" % (Cnf["Dinstall::MyEmailAddress"], changes["maintainer822"], os.path.basename(changes_filename), reject_message, reject_footer);
+ Subst["__MANUAL_REJECT_MESSAGE__"] = "";
+ Subst["__CC__"] = "X-Katie-Rejection: automatic (moo)";
+ reject_mail_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/katie.rejected","r").read());
else: # Have a manual rejection file to use
reject_mail_message = ""; # avoid <undef>'s
##################################################################
def manual_reject (changes_filename):
+ global Subst;
+
# Build up the rejection email
- user_email_address = string.replace(string.split(pwd.getpwuid(os.getuid())[4],',')[0], '.', '')
- user_email_address = user_email_address + " <%s@%s>" % (pwd.getpwuid(os.getuid())[0], Cnf["Dinstall::MyHost"])
+ user_email_address = utils.whoami() + " <%s@%s>" % (pwd.getpwuid(os.getuid())[0], Cnf["Dinstall::MyHost"])
manual_reject_message = Cnf.get("Dinstall::Options::Manual-Reject", "")
- reject_mail_message = """From: %s
-Cc: %s
-To: %s
-Bcc: troup@auric.debian.org
-Subject: %s REJECTED
-
-%s
-%s
-===
-%s""" % (user_email_address, Cnf["Dinstall::MyEmailAddress"], changes["maintainer822"], os.path.basename(changes_filename), manual_reject_message, reject_message, reject_footer)
+ Subst["__MANUAL_REJECT_MESSAGE__"] = manual_reject_message;
+ Subst["__CC__"] = "Cc: " + Cnf["Dinstall::MyEmailAddress"];
+ reject_mail_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/katie.rejected","r").read());
# Write the rejection email out as the <foo>.reason file
reason_filename = re_changes.sub("reason", os.path.basename(changes_filename));
# If we weren't given one, spawn an editor so the user can add one in
if manual_reject_message == "":
- result = os.system("vi +6 %s" % (reject_file))
+ result = os.system("vi +6 %s" % (reject_filename))
if result != 0:
- sys.stderr.write ("vi invocation failed for `%s'!\n" % (reject_file))
+ sys.stderr.write ("vi invocation failed for `%s'!\n" % (reject_filename))
sys.exit(result)
# Then process it as if it were an automatic rejection
#####################################################################################################################
def acknowledge_new (changes_filename, summary):
- global new_ack_new;
+ global new_ack_new, Subst;
changes_filename = os.path.basename(changes_filename);
print "Sending new ack.";
if not Cnf["Dinstall::Options::No-Mail"]:
- new_ack_message = """Return-Path: %s
-From: %s
-To: %s
-Bcc: troup@auric.debian.org
-Subject: %s is NEW
-
-%s
-%s""" % (Cnf["Dinstall::MyEmailAddress"], Cnf["Dinstall::MyEmailAddress"], changes["maintainer822"], changes_filename, summary, new_ack_footer);
+ Subst["__SUMMARY__"] = summary;
+ new_ack_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/katie.new","r").read());
utils.send_mail(new_ack_message,"");
#####################################################################################################################
def announce (short_summary, action):
+ global Subst;
+
# Only do announcements for source uploads with a recent dpkg-dev installed
if float(changes.get("format", 0)) < 1.6 or not changes["architecture"].has_key("source"):
return ""
lists_done = {}
summary = ""
+ Subst["__SHORT_SUMMARY__"] = short_summary;
for dist in changes["distribution"].keys():
list = Cnf.Find("Suite::%s::Announce" % (dist))
- if list == None or lists_done.has_key(list):
+ if list == "" or lists_done.has_key(list):
continue
lists_done[list] = 1
summary = summary + "Announcing to %s\n" % (list)
if action:
- mail_message = """Return-Path: %s
-From: %s
-To: %s
-Bcc: troup@auric.debian.org
-Subject: Installed %s %s (%s)
-
-%s
-
-Installed:
-%s
-""" % (Cnf["Dinstall::MyEmailAddress"], changes["maintainer822"], list, changes["source"], changes["version"], string.join(changes["architecture"].keys(), ' ' ),
- changes["filecontents"], short_summary)
+ Subst["__ANNOUNCE_LIST_ADDRESS__"] = list;
+ mail_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/katie.announce","r").read());
utils.send_mail (mail_message, "")
(dsc_rfc822, dsc_name, dsc_email) = utils.fix_maintainer (dsc.get("maintainer",Cnf["Dinstall::MyEmailAddress"]));
bugs = changes["closes"].keys()
bugs.sort()
- if dsc_name == changes["maintainername"]:
+ # changes["changedbyname"] == dsc_name is probably never true, but better
+ # safe than sorry
+ if dsc_name == changes["maintainername"] and (changes["changedbyname"] == "" or changes["changedbyname"] == dsc_name):
summary = summary + "Closing bugs: "
for bug in bugs:
summary = summary + "%s " % (bug)
if action:
- mail_message = """Return-Path: %s
-From: %s
-To: %s-close@bugs.debian.org
-Bcc: troup@auric.debian.org
-Subject: Bug#%s: fixed in %s %s
-
-We believe that the bug you reported is fixed in the latest version of
-%s, which has been installed in the Debian FTP archive:
-
-%s""" % (Cnf["Dinstall::MyEmailAddress"], changes["maintainer822"], bug, bug, changes["source"], changes["version"], changes["source"], short_summary)
-
+ Subst["__BUG_NUMBER__"] = bug;
if changes["distribution"].has_key("stable"):
- mail_message = mail_message + """Note that this package is not part of the released stable Debian
+ Subst["__STABLE_WARNING__"] = """
+Note that this package is not part of the released stable Debian
distribution. It may have dependencies on other unreleased software,
or other instabilities. Please take care if you wish to install it.
The update will eventually make its way into the next released Debian
distribution."""
-
- mail_message = mail_message + """A summary of the changes between this version and the previous one is
-attached.
-
-Thank you for reporting the bug, which will now be closed. If you
-have further comments please address them to %s@bugs.debian.org,
-and the maintainer will reopen the bug report if appropriate.
-
-Debian distribution maintenance software
-pp.
-%s (supplier of updated %s package)
-
-(This message was generated automatically at their request; if you
-believe that there is a problem with it please contact the archive
-administrators by mailing ftpmaster@debian.org)
-
-
-%s""" % (bug, changes["maintainer"], changes["source"], changes["filecontents"])
-
+ else:
+ Subst["__STABLE_WARNING__"] = "";
+ mail_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/katie.bug-close","r").read());
utils.send_mail (mail_message, "")
else: # NMU
summary = summary + "Setting bugs to severity fixed: "
summary = summary + "%s " % (bug)
control_message = control_message + "tag %s + fixed\n" % (bug)
if action and control_message != "":
- mail_message = """Return-Path: %s
-From: %s
-To: control@bugs.debian.org
-Bcc: troup@auric.debian.org, %s
-Subject: Fixed in NMU of %s %s
-
-%s
-quit
-
-This message was generated automatically in response to a
-non-maintainer upload. The .changes file follows.
-
-%s
-""" % (Cnf["Dinstall::MyEmailAddress"], changes["maintainer822"], changes["maintainer822"], changes["source"], changes["version"], control_message, changes["filecontents"])
+ Subst["__CONTROL_MESSAGE__"] = control_message;
+ mail_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/katie.bug-nmu-fixed","r").read());
utils.send_mail (mail_message, "")
summary = summary + "\n"
# into the .changes structure and reprocess the .changes file.
def process_it (changes_file):
- global reprocess, orig_tar_id, changes, dsc, dsc_files, files, reject_message;
+ global reprocess, orig_tar_id, orig_tar_location, changes, dsc, dsc_files, files, reject_message;
# Reset some globals
reprocess = 1;
dsc_files = {};
files = {};
orig_tar_id = None;
+ orig_tar_location = "";
legacy_source_untouchable = {};
reject_message = "";
- orig_tar_id = None;
# Absolutize the filename to avoid the requirement of being in the
# same directory as the .changes file.
check_dsc ();
check_diff ();
+ update_subst(changes_file);
action(changes_file);
# Restore CWD
###############################################################################
def main():
- global Cnf, projectB, install_bytes, new_ack_old
+ global Cnf, projectB, install_bytes, new_ack_old, Subst
apt_pkg.init();
Cnf["Dinstall::Options::Ack-New"] = ""
postgresql_user = Cnf["DB::ROUser"];
- projectB = pg.connect('projectb', Cnf["DB::Host"], int(Cnf["DB::Port"]), None, None, postgresql_user);
+ projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]), None, None, postgresql_user);
db_access.init(Cnf, projectB);
new_ack_old[line[:-1]] = 1;
new_ack_list.close();
+ # Initialize the substitution template mapping global
+ Subst = {}
+ Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"];
+ Subst["__BUG_SERVER__"] = Cnf["Dinstall::BugServer"];
+ bcc = "X-Katie: $Revision: 1.40 $"
+ if Cnf.has_key("Dinstall::Bcc"):
+ Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]);
+ else:
+ Subst["__BCC__"] = bcc;
+ Subst["__DISTRO__"] = Cnf["Dinstall::MyDistribution"];
+ Subst["__KATIE_ADDRESS__"] = Cnf["Dinstall::MyEmailAddress"];
+
# Process the changes files
for changes_file in changes_files:
print "\n" + changes_file;
projects / dak.git / blobdiff