X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=kelly;h=054988a2ffb94038d55942417a42abd21b0e4d4c;hb=7a48559c50812af3b8b048553e0e2d8a85685d74;hp=3d226fb672018725376efe98d67a0f120a0d393c;hpb=99ff66ce9f9c03402574e6b623e07792db133993;p=dak.git

diff --git a/kelly b/kelly
index 3d226fb6..054988a2 100755
--- a/kelly
+++ b/kelly
@@ -1,8 +1,8 @@
 #!/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.7 2003-02-21 19:19:33 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
@@ -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.4 $";
+kelly_version = "$Revision: 1.7 $";
 
 Cnf = None;
 Options = None;
@@ -141,14 +141,12 @@ 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)] = "";
 
@@ -444,7 +442,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)
@@ -575,7 +574,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);
@@ -586,8 +591,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);