X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie;h=4b70c12114af1bb475cd7196714faa07c5a9eb7c;hb=288ceb69f46d61999156d583a7d99436078c6b29;hp=353f8633dc3d097771b2f0846622e2657ab46303;hpb=540f5ba12b1cdba7aac8f3a79df86ae1a5062f32;p=dak.git diff --git a/katie b/katie index 353f8633..4b70c121 100755 --- a/katie +++ b/katie @@ -2,7 +2,7 @@ # Installs Debian packaes # Copyright (C) 2000, 2001 James Troup -# $Id: katie,v 1.33 2001-03-21 01:05:07 troup Exp $ +# $Id: katie,v 1.43 2001-05-31 23:20:36 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 @@ -38,11 +38,12 @@ import utils, db_access ############################################################################### -re_isanum = re.compile (r'^\d+$'); -re_changes = re.compile (r'changes$'); +re_isanum = re.compile (r"^\d+$"); +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+$"); ######################################################################################### @@ -60,6 +61,7 @@ install_count = 0; install_bytes = 0.0; reprocess = 0; orig_tar_id = None; +orig_tar_location = ""; legacy_source_untouchable = {}; Subst = {}; @@ -139,8 +141,10 @@ def check_changes(filename): 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"]; + changes["architecture"] = {}; + # Parse the .changes field into a dictionary try: changes = utils.parse_changes(filename, 0) @@ -183,11 +187,6 @@ def check_changes(filename): # 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(): @@ -238,7 +237,7 @@ def check_changes(filename): # 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 @@ -329,6 +328,18 @@ def check_files(): files[file]["source"] = control.Find("Source", ""); if files[file]["source"] == "": files[file]["source"] = files[file]["package"]; + # Get the source version + source = files[file]["source"]; + source_version = "" + if string.find(source, "(") != -1: + m = utils.re_extract_src_version.match(source) + source = m.group(1) + source_version = m.group(2) + if not source_version: + source_version = files[file]["version"]; + files[file]["source package"] = source; + files[file]["source version"] = source_version; + # Checks for a source package... else: m = utils.re_issource.match(file) @@ -378,8 +389,8 @@ def check_files(): if not in_override_p(files[file]["package"], files[file]["component"], suite, files[file].get("dbtype",""), file): files[file]["new"] = 1 - # Find any old binary packages if files[file]["type"] == "deb": + # Find any old binary packages q = projectB.query("SELECT b.id, b.version, f.filename, l.path, c.name FROM binaries b, bin_associations ba, suite s, location l, component c, architecture a, files f WHERE b.package = '%s' AND s.suite_name = '%s' AND a.arch_string = '%s' AND ba.bin = b.id AND ba.suite = s.id AND b.architecture = a.id AND f.location = l.id AND l.component = c.id AND b.file = f.id" % (files[file]["package"], suite, files[file]["architecture"])) oldfiles = q.dictresult() @@ -394,6 +405,24 @@ def check_files(): if q.getresult() != []: reject_message = reject_message + "Rejected: can not overwrite existing copy of '%s' already in the archive.\n" % (file) + # Check for existent source + # FIXME: this is no longer per suite + 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"]); + 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); + # Find any old .dsc files elif files[file]["type"] == "dsc": q = projectB.query("SELECT s.id, s.version, f.filename, l.path, c.name FROM source s, src_associations sa, suite su, location l, component c, files f WHERE s.source = '%s' AND su.suite_name = '%s' AND sa.source = s.id AND sa.suite = su.id AND f.location = l.id AND l.component = c.id AND f.id = s.file" @@ -438,7 +467,7 @@ def check_files(): ############################################################################### 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": @@ -487,7 +516,7 @@ def check_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 != []: @@ -517,8 +546,11 @@ def check_dsc (): 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 @@ -558,7 +590,7 @@ def check_dsc (): # 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": @@ -622,15 +654,27 @@ def check_override (): def update_subst (changes_filename): global Subst; - - Subst["__ARCHITECTURE__"] = string.join(changes["architecture"].keys(), ' ' ); + + 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["filecontents"]; - Subst["__MAINTAINER_ADDRESS__"] = changes["maintainer822"]; - Subst["__MAINTAINER__"] = changes["maintainer"]; + 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["source"]; - Subst["__VERSION__"] = changes["version"]; + Subst["__SOURCE__"] = changes.get("source", "Unknown"); + Subst["__VERSION__"] = changes.get("version", "Unknown"); ##################################################################################################################### @@ -680,7 +724,11 @@ def action (changes_filename): 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: @@ -785,15 +833,9 @@ def install (changes_filename, summary, short_summary): architecture = files[file]["architecture"] architecture_id = db_access.get_architecture_id (architecture); type = files[file]["dbtype"]; - component = files[file]["component"] - source = files[file]["source"] - source_version = "" - if string.find(source, "(") != -1: - m = utils.re_extract_src_version.match(source) - source = m.group(1) - source_version = m.group(2) - if not source_version: - source_version = version + dsc_component = files[file]["component"] + source = files[file]["source package"] + source_version = files[file]["source version"]; filename = files[file]["pool name"] + file; if not files[file]["files id"]: files[file]["files id"] = db_access.set_files_id (filename, files[file]["size"], files[file]["md5sum"], files[file]["location id"]) @@ -811,7 +853,7 @@ def install (changes_filename, summary, short_summary): # 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: @@ -827,6 +869,24 @@ def install (changes_filename, summary, short_summary): # 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"): @@ -905,7 +965,8 @@ def stable_install (changes_filename, summary, short_summary): 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 @@ -935,8 +996,9 @@ def stable_install (changes_filename, summary, short_summary): install_count = install_count + 1; if not Cnf["Dinstall::Options::No-Mail"]: - Subst["__SUITE__"] = "into stable"; + 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) @@ -973,6 +1035,7 @@ def reject (changes_filename, manual_reject_mail_filename): os.write(fd, reject_message); os.close(fd); 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 's @@ -987,11 +1050,11 @@ 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", "") 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 .reason file @@ -1005,9 +1068,9 @@ def manual_reject (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 @@ -1104,7 +1167,7 @@ distribution.""" # 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; @@ -1113,9 +1176,9 @@ def process_it (changes_file): 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. @@ -1125,14 +1188,19 @@ def process_it (changes_file): # save and restore it. cwd = os.getcwd(); - check_signature (changes_file); - check_changes (changes_file); - while reprocess: - reprocess = 0; - check_files (); - check_md5sums (); - check_dsc (); - check_diff (); + try: + check_signature (changes_file); + check_changes (changes_file); + while reprocess: + reprocess = 0; + check_files (); + check_md5sums (); + check_dsc (); + check_diff (); + except: + print "ERROR"; + traceback.print_exc(file=sys.stdout); + pass; update_subst(changes_file); action(changes_file); @@ -1205,7 +1273,7 @@ def main(): Subst = {} Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"]; Subst["__BUG_SERVER__"] = Cnf["Dinstall::BugServer"]; - bcc = "X-Katie: $Id: katie,v 1.33 2001-03-21 01:05:07 troup Exp $" + bcc = "X-Katie: $Revision: 1.43 $" if Cnf.has_key("Dinstall::Bcc"): Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]); else: @@ -1213,6 +1281,9 @@ def main(): Subst["__DISTRO__"] = Cnf["Dinstall::MyDistribution"]; Subst["__KATIE_ADDRESS__"] = Cnf["Dinstall::MyEmailAddress"]; + # Sort the .changes files so that we process sourceful ones first + changes_files.sort(utils.changes_compare); + # Process the changes files for changes_file in changes_files: print "\n" + changes_file;