X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie;h=03c3298d722fe0cb5509b8fe6727f323695e48e2;hb=965f23a17180491622c2e4bc43f53433682973b4;hp=85d49d7825213c0b6dc52ac0328b966b12f45707;hpb=4c6e752553ce9613c497dc30d893f7f78fde3610;p=dak.git diff --git a/katie b/katie index 85d49d78..03c3298d 100755 --- a/katie +++ b/katie @@ -2,7 +2,7 @@ # Installs Debian packaes # Copyright (C) 2000, 2001 James Troup -# $Id: katie,v 1.45 2001-06-20 18:47:12 troup Exp $ +# $Id: katie,v 1.50 2001-06-24 23:17:43 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 @@ -43,7 +43,8 @@ re_changes = re.compile (r"changes$"); re_default_answer = re.compile(r"\[(.*)\]"); re_fdnic = re.compile("\n\n"); re_bad_diff = re.compile("^[\-\+][\-\+][\-\+] /dev/null"); -re_bin_only_nmu = re.compile("\.\d+\.\d+$"); +re_bin_only_nmu_of_mu = re.compile("\.\d+\.\d+$"); +re_bin_only_nmu_of_nmu = re.compile("\.\d+$"); ######################################################################################### @@ -64,6 +65,7 @@ orig_tar_id = None; orig_tar_location = ""; legacy_source_untouchable = {}; Subst = {}; +nmu = None; ######################################################################################### @@ -91,7 +93,75 @@ def check_signature (filename): return 0 return 1 -##################################################################################################################### +###################################################################################################### + +class nmu_p: + # Read in the group maintainer override file + def __init__ (self): + self.group_maint = {}; + if Cnf.get("Dinstall::GroupOverrideFilename"): + filename = Cnf["Dir::OverrideDir"] + Cnf["Dinstall::GroupOverrideFilename"]; + file = utils.open_file(filename, 'r'); + for line in file.readlines(): + line = string.strip(utils.re_comments.sub('', line)); + if line != "": + self.group_maint[line] = 1; + file.close(); + + def is_an_nmu (self, changes, dsc): + (dsc_rfc822, dsc_name, dsc_email) = utils.fix_maintainer (dsc.get("maintainer",Cnf["Dinstall::MyEmailAddress"])); + # 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): + return 0; + + if dsc.has_key("uploaders"): + uploaders = string.split(dsc["uploaders"], ","); + uploadernames = {}; + for i in uploaders: + (rfc822, name, email) = utils.fix_maintainer (string.strip(i)); + uploadernames[name] = ""; + if uploadernames.has_key(changes["changedbyname"]): + return 0; + + # Some group maintained packages (e.g. Debian QA) are never NMU's + if self.group_maint.has_key(changes["maintainername"]): + return 0; + + return 1; + +###################################################################################################### + +# Ensure that source exists somewhere in the archive for the binary +# upload being processed. +# +# (1) exact match => 1.0-3 +# (2) Bin-only NMU of an MU => 1.0-3.0.1 +# (3) Bin-only NMU of a sourceful-NMU => 1.0-3.1.1 + +def source_exists (package, source_version): + q = projectB.query("SELECT s.version FROM source s WHERE s.source = '%s'" % (package)); + + # Reduce the query results to a list of version numbers + ql = map(lambda x: x[0], q.getresult()); + + # Try (1) + if ql.count(source_version): + return 1; + + # Try (2) + orig_source_version = re_bin_only_nmu_of_mu.sub('', source_version); + if ql.count(orig_source_version): + return 1; + + # Try (3) + orig_source_version = re_bin_only_nmu_of_nmu.sub('', source_version); + if ql.count(orig_source_version): + return 1; + + # No source found... + return 0; + +###################################################################################################### # See if a given package is in the override table @@ -414,18 +484,10 @@ def check_files(): if changes["architecture"].has_key("source"): source_version = files[file]["source version"]; if source_version != changes["version"]: - reject_message = reject_message + "Rejected: source version (%s) for %s doesn't match changes version %s.\n" % (files[file]["sourceversion"], file, changes["version"]); + reject_message = reject_message + "Rejected: source version (%s) for %s doesn't match changes version %s.\n" % (files[file]["source version"], file, changes["version"]); else: - q = projectB.query("SELECT s.version FROM source s WHERE s.source = '%s'" % (files[file]["source package"])); - ql = map(lambda x: x[0], q.getresult()); - if ql.count(source_version) == 0: - # Maybe it's a binary only NMU ? - if re_bin_only_nmu.search(source_version): - orig_source_version = re_bin_only_nmu.sub('', source_version); - if ql.count(orig_source_version) == 0: - reject_message = reject_message + "Rejected: no source version (%s [or %s]) found in %s for %s (%s).\n" % (source_version, orig_source_version, suite, files[file]["source package"], file); - else: - reject_message = reject_message + "Rejected: no source version (%s) found in %s for %s (%s).\n" % (source_version, suite, files[file]["source package"], file); + if not source_exists (files[file]["source package"], source_version): + reject_message = reject_message + "Rejected: no source found for %s %s (%s).\n" % (files[file]["source package"], source_version, file); # Find any old .dsc files elif files[file]["type"] == "dsc": @@ -910,7 +972,7 @@ def install (changes_filename, summary, short_summary): try: utils.move (changes_filename, Cnf["Dir::IncomingDir"] + 'DONE/' + os.path.basename(changes_filename)) except: - sys.stderr.write("W: couldn't move changes file '%s' to DONE directory [Got %s].\n" % (os.path.basename(changes_filename), sys.exc_type)); + utils.warn("couldn't move changes file '%s' to DONE directory. [Got %s]" % (os.path.basename(changes_filename), sys.exc_type)); install_count = install_count + 1; @@ -942,8 +1004,7 @@ def stable_install (changes_filename, summary, short_summary): q = projectB.query("SELECT id FROM source WHERE source = '%s' AND version = '%s'" % (package, version)) ql = q.getresult() if ql == []: - sys.stderr.write("INTERNAL ERROR: couldn't find '%s' (%s) in source table.\n" % (package, version)); - sys.exit(1); + utils.fubar("[INTERNAL ERROR] couldn't find '%s' (%s) in source table." % (package, version)); source_id = ql[0][0]; suite_id = db_access.get_suite_id('proposed-updates'); projectB.query("DELETE FROM src_associations WHERE suite = '%s' AND source = '%s'" % (suite_id, source_id)); @@ -959,8 +1020,7 @@ def stable_install (changes_filename, summary, short_summary): q = projectB.query("SELECT b.id FROM binaries b, architecture a WHERE b.package = '%s' AND b.version = '%s' AND (a.arch_string = '%s' OR a.arch_string = 'all') AND b.architecture = a.id" % (package, version, architecture)) ql = q.getresult() if ql == []: - sys.stderr.write("INTERNAL ERROR: couldn't find '%s' (%s for %s architecture) in binaries table.\n" % (package, version, architecture)); - sys.exit(1); + utils.fubar("[INTERNAL ERROR] couldn't find '%s' (%s for %s architecture) in binaries table." % (package, version, architecture)); binary_id = ql[0][0]; suite_id = db_access.get_suite_id('proposed-updates'); projectB.query("DELETE FROM bin_associations WHERE suite = '%s' AND bin = '%s'" % (suite_id, binary_id)); @@ -1021,14 +1081,14 @@ def reject (changes_filename, manual_reject_mail_filename): try: utils.move (changes_filename, "%s/REJECT/%s" % (Cnf["Dir::IncomingDir"], base_changes_filename)); except: - sys.stderr.write("W: couldn't reject changes file '%s' [Got %s].\n" % (base_changes_filename, sys.exc_type)); + utils.warn("couldn't reject changes file '%s'. [Got %s]" % (base_changes_filename, sys.exc_type)); pass; for file in files.keys(): if os.path.exists(file): try: utils.move (file, "%s/REJECT/%s" % (Cnf["Dir::IncomingDir"], file)); except: - sys.stderr.write("W: couldn't reject file '%s' [Got %s].\n" % (file, sys.exc_type)); + utils.warn("couldn't reject file '%s'. [Got %s]" % (file, sys.exc_type)); pass; # If this is not a manual rejection generate the .reason file and rejection mail message @@ -1074,8 +1134,7 @@ def manual_reject (changes_filename): if manual_reject_message == "": result = os.system("vi +6 %s" % (reject_filename)) if result != 0: - sys.stderr.write ("vi invocation failed for `%s'!\n" % (reject_filename)) - sys.exit(result) + utils.fubar("vi invocation failed for `%s'!" % (reject_filename), result); # Then process it as if it were an automatic rejection reject (changes_filename, reject_filename) @@ -1124,12 +1183,9 @@ def announce (short_summary, action): 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() - # 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): + if not nmu.is_an_nmu(changes, dsc): summary = summary + "Closing bugs: " for bug in bugs: summary = summary + "%s " % (bug) @@ -1215,7 +1271,7 @@ def process_it (changes_file): ############################################################################### def main(): - global Cnf, projectB, install_bytes, new_ack_old, Subst + global Cnf, projectB, install_bytes, new_ack_old, Subst, nmu apt_pkg.init(); @@ -1257,8 +1313,7 @@ def main(): # Check that we aren't going to clash with the daily cron job if os.path.exists("%s/Archive_Maintenance_In_Progress" % (Cnf["Dir::RootDir"])) and not Cnf["Dinstall::Options::No-Lock"]: - sys.stderr.write("Archive maintenance in progress. Try again later.\n"); - sys.exit(2); + utils.fubar("Archive maintenance in progress. Try again later."); # Obtain lock if not in no-action mode @@ -1277,7 +1332,7 @@ def main(): Subst = {} Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"]; Subst["__BUG_SERVER__"] = Cnf["Dinstall::BugServer"]; - bcc = "X-Katie: $Revision: 1.45 $" + bcc = "X-Katie: $Revision: 1.50 $" if Cnf.has_key("Dinstall::Bcc"): Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]); else: @@ -1285,6 +1340,9 @@ def main(): Subst["__DISTRO__"] = Cnf["Dinstall::MyDistribution"]; Subst["__KATIE_ADDRESS__"] = Cnf["Dinstall::MyEmailAddress"]; + # Read in the group-maint override file + nmu = nmu_p(); + # Sort the .changes files so that we process sourceful ones first changes_files.sort(utils.changes_compare);