#!/usr/bin/env python
# Installs Debian packages
-# Copyright (C) 2000, 2001, 2002 James Troup <james@nocrew.org>
-# $Id: kelly,v 1.4 2003-01-02 18:12:05 troup Exp $
+# Copyright (C) 2000, 2001, 2002, 2003 James Troup <james@nocrew.org>
+# $Id: kelly,v 1.12 2003-09-24 00:13: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
###############################################################################
-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.4 $";
+kelly_version = "$Revision: 1.12 $";
Cnf = None;
Options = None;
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
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)] = "";
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]);
###############################################################################
projectB.query("COMMIT WORK");
# Move the .changes into the 'done' directory
- try:
- utils.move (pkg.changes_file, os.path.join(Cnf["Dir::Queue::Done"], os.path.basename(pkg.changes_file)));
- except:
- utils.warn("couldn't move changes file '%s' to DONE directory. [Got %s]" % (os.path.basename(pkg.changes_file), sys.exc_type));
+ utils.move (pkg.changes_file,
+ os.path.join(Cnf["Dir::Queue::Done"], os.path.basename(pkg.changes_file)));
+ # Remove the .katie file
os.unlink(Katie.pkg.changes_file[:-8]+".katie");
if changes["architecture"].has_key("source") and Urgency_Logger:
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)
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
# 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);
- Logger = Katie.Logger = logging.Logger(Cnf, "katie");
+ 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, "kelly");
if not installing_to_stable and Cnf.get("Dir::UrgencyLog"):
Urgency_Logger = Urgency_Log(Cnf);
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);