X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=kelly;h=37b6db47eaad63ad268f13a8dfa04ea93fa7f968;hb=c5617d291dc17395a9d23c757d7dc815f6eed49e;hp=44d2a4dbf5e7588626262a0c74121087eb096a30;hpb=073b487a41897e27b0e391ebe573cfec739c7030;p=dak.git diff --git a/kelly b/kelly index 44d2a4db..37b6db47 100755 --- a/kelly +++ b/kelly @@ -1,8 +1,8 @@ #!/usr/bin/env python # Installs Debian packages -# Copyright (C) 2000, 2001, 2002 James Troup -# $Id: kelly,v 1.2 2002-10-16 18:56:43 troup Exp $ +# Copyright (C) 2000, 2001, 2002, 2003 James Troup +# $Id: kelly,v 1.10 2003-07-29 14:00:39 ajt 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 @@ -32,14 +32,14 @@ ############################################################################### -import FCNTL, fcntl, os, sys, time; +import fcntl, os, sys, time; import apt_pkg; import db_access, katie, logging, utils; ############################################################################### # Globals -kelly_version = "$Revision: 1.2 $"; +kelly_version = "$Revision: 1.10 $"; Cnf = None; Options = None; @@ -110,12 +110,16 @@ def reject (str, prefix="Rejected: "): def check(): for file in files.keys(): + # The .orig.tar.gz can disappear out from under us is it's a + # duplicate of one in the archive. + if not files.has_key(file): + continue; # Check that the source still exists if files[file]["type"] == "deb": source_version = files[file]["source version"]; source_package = files[file]["source package"]; if not changes["architecture"].has_key("source") \ - and not Katie.source_exists(source_package, source_version): + and not Katie.source_exists(source_package, source_version, changes["distribution"].keys()): reject("no source found for %s %s (%s)." % (source_package, source_version, file)); # Version and file overwrite checks @@ -141,20 +145,25 @@ def init(): Arguments = [('a',"automatic","Dinstall::Options::Automatic"), ('h',"help","Dinstall::Options::Help"), - ('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"), ('V',"version","Dinstall::Options::Version")]; - for i in ["automatic", "help", "manual-reject", "no-action", - "no-lock", "no-mail", "version"]: + for i in ["automatic", "help", "no-action", "no-lock", "no-mail", "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") + if Options["Help"]: + usage(); + + if Options["Version"]: + print "kelly %s" % (kelly_version); + sys.exit(0); + Katie = katie.Katie(Cnf); projectB = Katie.projectB; @@ -170,7 +179,7 @@ def init(): ############################################################################### def usage (exit_code=0): - print """Usage: dinstall [OPTION]... [CHANGES]... + print """Usage: kelly [OPTION]... [CHANGES]... -a, --automatic automatic run -h, --help show this help and exit. -n, --no-action don't do anything @@ -240,7 +249,7 @@ def do_reject (): os.write(fd, reject_mail_message); os.close(fd); - utils.send_mail (reject_mail_message, ""); + utils.send_mail(reject_mail_message); Logger.log(["unaccepted", pkg.changes_file]); ############################################################################### @@ -369,17 +378,18 @@ def install (): install_bytes += float(files[file]["size"]); # Copy the .changes file across for suite which need it. - copy_changes_p = copy_katie_p = 0; + copy_changes = {}; + copy_katie = {}; for suite in changes["distribution"].keys(): if Cnf.has_key("Suite::%s::CopyChanges" % (suite)): - copy_changes_p = 1; + copy_changes[Cnf["Suite::%s::CopyChanges" % (suite)]] = ""; # and the .katie file... if Cnf.has_key("Suite::%s::CopyKatie" % (suite)): - copy_katie_p = 1; - if copy_changes_p: - utils.copy(pkg.changes_file, Cnf["Dir::Root"] + Cnf["Suite::%s::CopyChanges" % (suite)]); - if copy_katie_p: - utils.copy(Katie.pkg.changes_file[:-8]+".katie", Cnf["Suite::%s::CopyKatie" % (suite)]); + copy_katie[Cnf["Suite::%s::CopyKatie" % (suite)]] = ""; + for dest in copy_changes.keys(): + utils.copy(pkg.changes_file, Cnf["Dir::Root"] + dest); + for dest in copy_katie.keys(): + utils.copy(Katie.pkg.changes_file[:-8]+".katie", dest); projectB.query("COMMIT WORK"); @@ -436,7 +446,8 @@ def stable_install (summary, short_summary): print "Installing to stable."; - # Begin a transaction; if we bomb out anywhere between here and the COMMIT WORK below, the DB will not be changed. + # Begin a transaction; if we bomb out anywhere between here and + # the COMMIT WORK below, the DB won't be changed. projectB.query("BEGIN WORK"); # Add the source to stable (and remove it from proposed-updates) @@ -504,7 +515,7 @@ def stable_install (summary, short_summary): Subst["__SUITE__"] = " into stable"; Subst["__SUMMARY__"] = summary; mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/kelly.installed"); - utils.send_mail(mail_message, ""); + utils.send_mail(mail_message); Katie.announce(short_summary, 1) # Finally remove the .katie file @@ -551,13 +562,6 @@ def main(): changes_files = init(); - if Options["Help"]: - usage(); - - if Options["Version"]: - print "kelly %s" % (kelly_version); - sys.exit(0); - # -n/--dry-run invalidates some other options which would involve things happening if Options["No-Action"]: Options["Automatic"] = ""; @@ -574,7 +578,13 @@ def main(): # 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 | os.O_CREAT); - fcntl.lockf(lock_fd, FCNTL.F_TLOCK); + try: + fcntl.lockf(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB); + except IOError, e: + if errno.errorcode[e.errno] == 'EACCES' or errno.errorcode[e.errno] == 'EAGAIN': + utils.fubar("Couldn't obtain lock; assuming another kelly is already running."); + else: + raise; Logger = Katie.Logger = logging.Logger(Cnf, "katie"); if not installing_to_stable and Cnf.get("Dir::UrgencyLog"): Urgency_Logger = Urgency_Log(Cnf); @@ -585,8 +595,6 @@ def main(): Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]); else: Subst["__BCC__"] = bcc; - if Cnf.has_key("Dinstall::StableRejector"): - Subst["__STABLE_REJECTOR__"] = Cnf["Dinstall::StableRejector"]; # Sort the .changes files so that we process sourceful ones first changes_files.sort(utils.changes_compare);