X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie;h=19e8a7f7c246173a327767e768b304e09aca0823;hb=791e932971b92146d3621efdd29facc02b109774;hp=1649d22d1c33ee2688c08f3df3f266b4afd40df2;hpb=8fbd4a8b434352dc8fcb182b4e11d5ff37bf3373;p=dak.git diff --git a/katie b/katie index 1649d22d..19e8a7f7 100755 --- a/katie +++ b/katie @@ -1,8 +1,8 @@ #!/usr/bin/env python -# Installs Debian packaes +# Installs Debian packages # Copyright (C) 2000, 2001 James Troup -# $Id: katie,v 1.57 2001-08-26 00:36:12 troup Exp $ +# $Id: katie,v 1.67 2001-11-25 01:21:34 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 @@ -20,7 +20,7 @@ # Originally based almost entirely on dinstall by Guy Maor -######################################################################################### +############################################################################### # Cartman: "I'm trying to make the best of a bad situation, I don't # need to hear crap from a bunch of hippy freaks living in @@ -30,7 +30,7 @@ # # Cartman: "uhh.. screw you guys... home." -######################################################################################### +############################################################################### import FCNTL, commands, fcntl, getopt, gzip, os, pg, pwd, re, shutil, stat, string, sys, tempfile, time, traceback import apt_inst, apt_pkg @@ -70,20 +70,48 @@ orig_tar_location = ""; legacy_source_untouchable = {}; Subst = {}; nmu = None; +katie_version = "$Revision: 1.67 $"; -######################################################################################### +############################################################################### -def usage (exit_code): +def init(): + global Cnf, Options; + + Cnf = utils.get_conf() + + Arguments = [('a',"automatic","Dinstall::Options::Automatic"), + ('h',"help","Dinstall::Options::Help"), + ('k',"ack-new","Dinstall::Options::Ack-New"), + ('m',"manual-reject","Dinstall::Options::Manual-Reject", "HasArg"), + ('n',"no-action","Dinstall::Options::No-Action"), + ('p',"no-lock", "Dinstall::Options::No-Lock"), + ('s',"no-mail", "Dinstall::Options::No-Mail"), + ('u',"override-distribution", "Dinstall::Options::Override-Distribution", "HasArg"), + ('V',"version","Dinstall::Options::Version")]; + + for i in ["automatic", "help", "ack-new", "manual-reject", "no-action", + "no-lock", "no-mail", "override-distribution", "version"]: + if not Cnf.has_key("Dinstall::Options::%s" % (i)): + Cnf["Dinstall::Options::%s" % (i)] = ""; + + changes_files = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); + Options = Cnf.SubTree("Dinstall::Options") + + return changes_files; + +############################################################################### + +def usage (exit_code=0): print """Usage: dinstall [OPTION]... [CHANGES]... -a, --automatic automatic run - -D, --debug=VALUE turn on debugging -h, --help show this help and exit. -k, --ack-new acknowledge new packages !! for cron.daily only !! -m, --manual-reject=MSG manual reject with `msg' -n, --no-action don't do anything -p, --no-lock don't check lockfile !! for cron.daily only !! + -s, --no-mail don't send any mail -u, --distribution=DIST override distribution to `dist' - -v, --version display the version number and exit""" + -V, --version display the version number and exit""" sys.exit(exit_code) ######################################################################################### @@ -105,19 +133,19 @@ class nmu_p: self.group_maint = {}; if Cnf.get("Dinstall::GroupOverrideFilename"): filename = Cnf["Dir::OverrideDir"] + Cnf["Dinstall::GroupOverrideFilename"]; - file = utils.open_file(filename, 'r'); + file = utils.open_file(filename); 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["changedby822"] == "" or changes["changedbyname"] == dsc_name): return 0; - + if dsc.has_key("uploaders"): uploaders = string.split(dsc["uploaders"], ","); uploadernames = {}; @@ -132,11 +160,11 @@ class nmu_p: return 0; return 1; - + ###################################################################################################### # Ensure that source exists somewhere in the archive for the binary -# upload being processed. +# upload being processed. # # (1) exact match => 1.0-3 # (2) Bin-only NMU of an MU => 1.0-3.0.1 @@ -171,7 +199,7 @@ def source_exists (package, source_version): def in_override_p (package, component, suite, binary_type, file): global files; - + if binary_type == "": # must be source type = "dsc"; else: @@ -206,7 +234,7 @@ def in_override_p (package, component, suite, binary_type, file): if result != []: files[file]["override section"] = result[0][0]; files[file]["override priority"] = result[0][1]; - + return result; ##################################################################################################################### @@ -218,7 +246,7 @@ def check_changes(filename): 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) @@ -271,9 +299,9 @@ def check_changes(filename): reject_message = reject_message + "Rejected: `%s' from Closes field isn't a number.\n" % (i) # Ensure there _is_ a target distribution - if changes["distribution"].keys() == []: + if not changes["distribution"].keys(): reject_message = reject_message + "Rejected: huh? Distribution field is empty in changes file.\n"; - + # Map frozen to unstable if frozen doesn't exist if changes["distribution"].has_key("frozen") and not Cnf.has_key("Suite::Frozen"): del changes["distribution"]["frozen"] @@ -300,7 +328,7 @@ def check_changes(filename): reject_message = reject_message + "Mapping stable to unstable for unreleased arch `%s'.\n" % (i) del changes["distribution"]["stable"] changes["distribution"]["unstable"] = 1; - + # Map arches not being released from frozen to unstable if changes["distribution"].has_key("frozen"): for i in changes["architecture"].keys(): @@ -313,16 +341,17 @@ def check_changes(filename): if changes["distribution"].has_key("stable"): # If running from within proposed-updates; assume an install to stable if string.find(os.getcwd(), 'proposed-updates') != -1: - # 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" % (i) - del changes["distribution"][i] - changes["stable upload"] = 1; + # Remove non-stable target distributions + for dist in changes["distribution"].keys(): + if dist != "stable": + reject_message = reject_message + "Removing %s from distribution list.\n" % (dist); + del changes["distribution"][dist]; + changes["stable install"] = 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 file = files.keys()[0]; if os.access(file, os.R_OK) == 0: pool_dir = Cnf["Dir::PoolDir"] + '/' + utils.poolify(changes["source"], files[file]["component"]); + changes["installing from the pool"] = 1; os.chdir(pool_dir); # Otherwise (normal case) map stable to updates else: @@ -333,15 +362,15 @@ def check_changes(filename): # chopversion = no epoch; chopversion2 = no epoch and no revision (e.g. for .orig.tar.gz comparison) changes["chopversion"] = utils.re_no_epoch.sub('', changes["version"]) changes["chopversion2"] = utils.re_no_revision.sub('', changes["chopversion"]) - + if string.find(reject_message, "Rejected:") != -1: return 0 - else: + else: return 1 def check_files(): global reject_message - + archive = utils.where_am_i(); for file in files.keys(): @@ -364,7 +393,7 @@ def check_files(): # Extract package information using dpkg-deb try: - control = apt_pkg.ParseSection(apt_inst.debExtractControl(utils.open_file(file,"r"))) + control = apt_pkg.ParseSection(apt_inst.debExtractControl(utils.open_file(file))); except: reject_message = reject_message + "Rejected: %s: debExtractControl() raised %s.\n" % (file, sys.exc_type); # Can't continue, none of the checks on control would work. @@ -377,7 +406,7 @@ def check_files(): reject_message = reject_message + "Rejected: %s: No architecture field in control.\n" % (file) if control.Find("Version") == None: reject_message = reject_message + "Rejected: %s: No version field in control.\n" % (file) - + # Ensure the package name matches the one give in the .changes if not changes["binary"].has_key(control.Find("Package", "")): reject_message = reject_message + "Rejected: %s: control file lists name as `%s', which isn't in changes file.\n" % (file, control.Find("Package", "")) @@ -422,7 +451,7 @@ def check_files(): 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) @@ -472,7 +501,7 @@ def check_files(): # See if the package is NEW if not in_override_p(files[file]["package"], files[file]["component"], suite, files[file].get("dbtype",""), file): files[file]["new"] = 1 - + 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' OR a.arch_string = 'all') 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" @@ -484,7 +513,7 @@ def check_files(): if apt_pkg.VersionCompare(files[file]["version"], oldfile["version"]) != 1: reject_message = reject_message + "Rejected: %s Old version `%s' >= new version `%s'.\n" % (file, oldfile["version"], files[file]["version"]) # Check for existing copies of the file - if not changes.has_key("stable upload"): + if not changes.has_key("stable install"): q = projectB.query("SELECT b.id FROM binaries b, architecture a WHERE b.package = '%s' AND b.version = '%s' AND a.arch_string = '%s' AND a.id = b.architecture" % (files[file]["package"], files[file]["version"], files[file]["architecture"])) if q.getresult() != []: reject_message = reject_message + "Rejected: can not overwrite existing copy of '%s' already in the archive.\n" % (file) @@ -517,7 +546,7 @@ def check_files(): # Validate the priority if string.find(files[file]["priority"],'/') != -1: reject_message = reject_message + "Rejected: file '%s' has invalid priority '%s' [contains '/'].\n" % (file, files[file]["priority"]); - + # Check the md5sum & size against existing files (if any) location = Cnf["Dir::PoolDir"]; files[file]["location id"] = db_access.get_location_id (location, component, archive); @@ -534,10 +563,10 @@ def check_files(): if files[file]["oldfiles"].has_key(suite) and files[file]["oldfiles"][suite]["name"] != files[file]["component"]: files[file]["othercomponents"] = files[file]["oldfiles"][suite]["name"]; - + if string.find(reject_message, "Rejected:") != -1: return 0 - else: + else: return 1 ############################################################################### @@ -607,7 +636,7 @@ def check_dsc (): actual_size = int(files[dsc_file]["size"]); found = "%s in incoming" % (dsc_file) # Check the file does not already exist in the archive - if not changes.has_key("stable upload"): + if not changes.has_key("stable install"): q = projectB.query("SELECT 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)); # "It has not broken them. It has fixed a @@ -639,7 +668,7 @@ def check_dsc (): if len(ql) > 1: for i in ql: old_file = i[0] + i[1]; - actual_md5 = apt_pkg.md5sum(utils.open_file(old_file,"r")); + actual_md5 = apt_pkg.md5sum(utils.open_file(old_file)); actual_size = os.stat(old_file)[stat.ST_SIZE]; if actual_md5 == dsc_files[dsc_file]["md5sum"] and actual_size == int(dsc_files[dsc_file]["size"]): x = i; @@ -647,7 +676,7 @@ def check_dsc (): legacy_source_untouchable[i[3]] = ""; old_file = x[0] + x[1]; - actual_md5 = apt_pkg.md5sum(utils.open_file(old_file,"r")); + actual_md5 = apt_pkg.md5sum(utils.open_file(old_file)); actual_size = os.stat(old_file)[stat.ST_SIZE]; found = old_file; suite_type = x[2]; @@ -685,7 +714,7 @@ def check_dsc (): if string.find(reject_message, "Rejected:") != -1: return 0 - else: + else: return 1 ############################################################################### @@ -709,7 +738,7 @@ def check_diff (): if string.find(reject_message, "Rejected:") != -1: return 0 - else: + else: return 1 ############################################################################### @@ -719,7 +748,7 @@ def check_md5sums (): for file in files.keys(): try: - file_handle = utils.open_file(file,"r"); + file_handle = utils.open_file(file); except utils.cant_open_exc: pass; else: @@ -728,9 +757,9 @@ def check_md5sums (): def check_override (): global Subst; - - # Only check section & priority on sourceful uploads - if not changes["architecture"].has_key("source"): + + # Only check section & priority on sourceful non-stable installs + if not changes["architecture"].has_key("source") or changes.has_key("stable install"): return; summary = "" @@ -790,21 +819,23 @@ def update_subst (changes_filename): ##################################################################################################################### def action (changes_filename): - byhand = confirm = suites = summary = new = ""; + byhand = summary = new = ""; # changes["distribution"] may not exist in corner cases # (e.g. unreadable changes files) if not changes.has_key("distribution") or not isinstance(changes["distribution"], DictType): changes["distribution"] = {}; - + + confirm = [] + suites = [] for suite in changes["distribution"].keys(): if Cnf.has_key("Suite::%s::Confirm"): - confirm = confirm + suite + ", " - suites = suites + suite + ", " - confirm = confirm[:-2] - suites = suites[:-2] + confirm.append(suite) + suites.append(suite) - for file in files.keys(): + file_keys = files.keys(); + file_keys.sort(); + for file in file_keys: if files[file].has_key("byhand"): byhand = 1 summary = summary + file + " byhand\n" @@ -814,7 +845,7 @@ def action (changes_filename): if files[file].has_key("othercomponents"): summary = summary + "WARNING: Already present in %s distribution.\n" % (files[file]["othercomponents"]) if files[file]["type"] == "deb": - summary = summary + apt_pkg.ParseSection(apt_inst.debExtractControl(utils.open_file(file,"r")))["Description"] + '\n'; + summary = summary + apt_pkg.ParseSection(apt_inst.debExtractControl(utils.open_file(file)))["Description"] + '\n'; else: files[file]["pool name"] = utils.poolify (changes["source"], files[file]["component"]) destination = Cnf["Dir::PoolRoot"] + files[file]["pool name"] + file @@ -829,7 +860,7 @@ def action (changes_filename): summary = summary + "Changes: " + f; summary = summary + announce (short_summary, 0) - + (prompt, answer) = ("", "XXX") if Options["No-Action"] or Options["Automatic"]: answer = 'S' @@ -848,7 +879,7 @@ def action (changes_filename): if Options["Automatic"]: answer = 'R'; elif new: - print "NEW to %s\n%s%s" % (suites, reject_message, summary),; + print "NEW to %s\n%s%s" % (string.join(suites, ", "), reject_message, summary),; prompt = "[S]kip, New ack, Manual reject, Quit ?"; if Options["Automatic"] and Options["Ack-New"]: answer = 'N'; @@ -856,7 +887,7 @@ def action (changes_filename): print "BYHAND\n" + reject_message + summary,; prompt = "[I]nstall, Manual reject, Skip, Quit ?"; elif confirm: - print "CONFIRM to %s\n%s%s" % (confirm, reject_message, summary), + print "CONFIRM to %s\n%s%s" % (string.join(confirm, ", "), reject_message, summary), prompt = "[I]nstall, Manual reject, Skip, Quit ?"; else: print "INSTALL\n" + reject_message + summary,; @@ -883,16 +914,16 @@ def action (changes_filename): elif answer == 'Q': sys.exit(0) -##################################################################################################################### +############################################################################### def install (changes_filename, summary, short_summary): global install_count, install_bytes, Subst; - # Stable uploads are a special case - if changes.has_key("stable upload"): + # stable installs are a special case + if changes.has_key("stable install"): stable_install (changes_filename, summary, short_summary); return; - + print "Installing." Logger.log(["installing changes",changes_filename]); @@ -934,7 +965,7 @@ def install (changes_filename, summary, short_summary): if files_id == None: files_id = db_access.set_files_id (filename, dsc_files[dsc_file]["size"], dsc_files[dsc_file]["md5sum"], dsc_location_id); projectB.query("INSERT INTO dsc_files (source, file) VALUES (currval('source_id_seq'), %d)" % (files_id)); - + # Add the .deb files to the DB for file in files.keys(): if files[file]["type"] == "deb": @@ -1032,11 +1063,11 @@ def install (changes_filename, summary, short_summary): announce (short_summary, 1) check_override (); -##################################################################################################################### +################################################################################ def stable_install (changes_filename, summary, short_summary): global install_count, install_bytes, Subst; - + print "Installing to stable." archive = utils.where_am_i(); @@ -1051,14 +1082,15 @@ def stable_install (changes_filename, summary, short_summary): version = dsc["version"] # NB: not files[file]["version"], that has no epoch q = projectB.query("SELECT id FROM source WHERE source = '%s' AND version = '%s'" % (package, version)) ql = q.getresult() - if ql == []: + if not ql: 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)); suite_id = db_access.get_suite_id('stable'); projectB.query("INSERT INTO src_associations (suite, source) VALUES ('%s', '%s')" % (suite_id, source_id)); - + install_bytes = install_bytes + float(files[file]["size"]) + # Add the .deb files to the DB for file in files.keys(): if files[file]["type"] == "deb": @@ -1067,13 +1099,14 @@ def stable_install (changes_filename, summary, short_summary): architecture = files[file]["architecture"] 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 == []: + if not ql: 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)); suite_id = db_access.get_suite_id('stable'); projectB.query("INSERT INTO bin_associations (suite, bin) VALUES ('%s', '%s')" % (suite_id, binary_id)); + install_bytes = install_bytes + float(files[file]["size"]) projectB.query("COMMIT WORK"); @@ -1086,7 +1119,7 @@ def stable_install (changes_filename, summary, short_summary): changelog_filename = Cnf["Dir::RootDir"] + Cnf["Suite::Stable::ChangeLogBase"] + "ChangeLog"; if os.path.exists(new_changelog_filename): os.unlink (new_changelog_filename); - + new_changelog = utils.open_file(new_changelog_filename, 'w'); for file in files.keys(): if files[file]["type"] == "deb": @@ -1098,7 +1131,7 @@ def stable_install (changes_filename, summary, short_summary): chop_changes = re_fdnic.sub("\n", changes["changes"]); new_changelog.write(chop_changes + '\n\n'); if os.access(changelog_filename, os.R_OK) != 0: - changelog = utils.open_file(changelog_filename, 'r'); + changelog = utils.open_file(changelog_filename); new_changelog.write(changelog.read()); new_changelog.close(); if os.access(changelog_filename, os.R_OK) != 0: @@ -1114,11 +1147,11 @@ def stable_install (changes_filename, summary, short_summary): 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); @@ -1131,13 +1164,37 @@ def reject (changes_filename, manual_reject_mail_filename): except: 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: - utils.warn("couldn't reject file '%s'. [Got %s]" % (file, sys.exc_type)); - pass; + if not changes.has_key("stable install"): + for file in files.keys(): + if os.path.exists(file): + try: + utils.move (file, "%s/REJECT/%s" % (Cnf["Dir::IncomingDir"], file)); + except: + utils.warn("couldn't reject file '%s'. [Got %s]" % (file, sys.exc_type)); + pass; + else: + suite_id = db_access.get_suite_id('proposed-updates'); + # Remove files from proposed-updates suite + for file in files.keys(): + if files[file]["type"] == "dsc": + package = dsc["source"]; + version = dsc["version"]; # NB: not files[file]["version"], that has no epoch + q = projectB.query("SELECT id FROM source WHERE source = '%s' AND version = '%s'" % (package, version)); + ql = q.getresult(); + if not ql: + utils.fubar("[INTERNAL ERROR] couldn't find '%s' (%s) in source table." % (package, version)); + source_id = ql[0][0]; + projectB.query("DELETE FROM src_associations WHERE suite = '%s' AND source = '%s'" % (suite_id, source_id)); + elif files[file]["type"] == "deb": + package = files[file]["package"]; + version = files[file]["version"]; + architecture = files[file]["architecture"]; + 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 not ql: + utils.fubar("[INTERNAL ERROR] couldn't find '%s' (%s for %s architecture) in binaries table." % (package, version, architecture)); + binary_id = ql[0][0]; + projectB.query("DELETE FROM bin_associations WHERE suite = '%s' AND bin = '%s'" % (suite_id, binary_id)); # If this is not a manual rejection generate the .reason file and rejection mail message if manual_reject_mail_filename == "": @@ -1151,7 +1208,7 @@ def reject (changes_filename, manual_reject_mail_filename): 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 - + # Send the rejection mail if appropriate if not Options["No-Mail"]: utils.send_mail (reject_mail_message, manual_reject_mail_filename); @@ -1162,15 +1219,19 @@ def reject (changes_filename, manual_reject_mail_filename): def manual_reject (changes_filename): global Subst; - - # Build up the rejection email + + # Build up the rejection email user_email_address = utils.whoami() + " <%s@%s>" % (pwd.getpwuid(os.getuid())[0], Cnf["Dinstall::MyHost"]) - manual_reject_message = Cnf.get("Dinstall::Options::Manual-Reject", "") + manual_reject_message = Options.get("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()); - + if changes.has_key("stable install"): + template = "katie.stable-rejected"; + else: + template = "katie.rejected"; + reject_mail_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/"+template,"r").read()); + # Write the rejection email out as the .reason file reason_filename = re_changes.sub("reason", os.path.basename(changes_filename)); reject_filename = "%s/REJECT/%s" % (Cnf["Dir::IncomingDir"], reason_filename) @@ -1179,7 +1240,7 @@ def manual_reject (changes_filename): fd = os.open(reject_filename, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0644); os.write(fd, reject_mail_message); os.close(fd); - + # 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_filename)) @@ -1190,12 +1251,14 @@ def manual_reject (changes_filename): reject (changes_filename, reject_filename) ##################################################################################################################### - + def acknowledge_new (changes_filename, summary): global new_ack_new, Subst; changes_filename = os.path.basename(changes_filename); + Logger.log(["new",changes_filename]); + new_ack_new[changes_filename] = 1; if new_ack_old.has_key(changes_filename): @@ -1212,7 +1275,7 @@ def acknowledge_new (changes_filename, summary): 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 "" @@ -1301,7 +1364,7 @@ def process_it (changes_file): # And since handling of installs to stable munges with the CWD; # save and restore it. cwd = os.getcwd(); - + try: check_signature (changes_file); check_changes (changes_file); @@ -1315,7 +1378,7 @@ def process_it (changes_file): print "ERROR"; traceback.print_exc(file=sys.stdout); pass; - + update_subst(changes_file); action(changes_file); @@ -1327,41 +1390,21 @@ def process_it (changes_file): def main(): global Cnf, Options, projectB, install_bytes, new_ack_old, Subst, nmu, Logger - apt_pkg.init(); - - Cnf = apt_pkg.newConfiguration(); - apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file()); - - Arguments = [('a',"automatic","Dinstall::Options::Automatic"), - ('d',"debug","Dinstall::Options::Debug", "IntVal"), - ('h',"help","Dinstall::Options::Help"), - ('k',"ack-new","Dinstall::Options::Ack-New"), - ('m',"manual-reject","Dinstall::Options::Manual-Reject", "HasArg"), - ('n',"no-action","Dinstall::Options::No-Action"), - ('p',"no-lock", "Dinstall::Options::No-Lock"), - ('s',"no-mail", "Dinstall::Options::No-Mail"), - ('u',"override-distribution", "Dinstall::Options::Override-Distribution", "HasArg"), - ('v',"version","Dinstall::Options::Version")]; - - changes_files = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv); - Options = Cnf.SubTree("Dinstall::Options") + changes_files = init(); if Options["Help"]: - usage(0); - - if Options["Version"]: - print "katie version 0.0000000000"; - usage(0); + usage(); - postgresql_user = None; # Default == Connect as user running program. + if Options["Version"]: + print "katie %s" % (katie_version); + sys.exit(0); # -n/--dry-run invalidates some other options which would involve things happening if Options["No-Action"]: Options["Automatic"] = ""; Options["Ack-New"] = ""; - postgresql_user = Cnf["DB::ROUser"]; - projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]), None, None, postgresql_user); + projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"])); db_access.init(Cnf, projectB); @@ -1369,32 +1412,36 @@ def main(): if not Options["No-Action"] and os.path.exists("%s/Archive_Maintenance_In_Progress" % (Cnf["Dir::RootDir"])) and not Options["No-Lock"]: utils.fubar("Archive maintenance in progress. Try again later."); - + # Obtain lock if not in no-action mode and initialize the log if not Options["No-Action"]: - lock_fd = os.open(Cnf["Dinstall::LockFile"], os.O_RDWR); + lock_fd = os.open(Cnf["Dinstall::LockFile"], os.O_RDWR | os.O_CREAT); fcntl.lockf(lock_fd, FCNTL.F_TLOCK); Logger = logging.Logger(Cnf, "katie"); - # Read in the list of already-acknowledged NEW packages - new_ack_list = utils.open_file(Cnf["Dinstall::NewAckList"],'r'); - new_ack_old = {}; - for line in new_ack_list.readlines(): - new_ack_old[line[:-1]] = 1; - new_ack_list.close(); + if Options["Ack-New"]: + # Read in the list of already-acknowledged NEW packages + if not os.path.exists(Cnf["Dinstall::NewAckList"]): + utils.touch_file(Cnf["Dinstall::NewAckList"]); + new_ack_list = utils.open_file(Cnf["Dinstall::NewAckList"]); + new_ack_old = {}; + for line in new_ack_list.readlines(): + 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.57 $" + bcc = "X-Katie: %s" % (katie_version); 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"]; + Subst["__STABLE_REJECTOR__"] = Cnf["Dinstall::StableRejector"]; # Read in the group-maint override file nmu = nmu_p(); @@ -1420,10 +1467,10 @@ def main(): for i in new_ack_new.keys(): new_ack_list.write(i+'\n') new_ack_list.close() - + if not Options["No-Action"]: Logger.close(); - + if __name__ == '__main__': main()