sort versions

[dak.git] / kelly

diff --git a/kelly b/kelly
index 44d2a4dbf5e7588626262a0c74121087eb096a30..2d0e2623103f76954aa70d49bf0e8510e5f2cafe 100755 (executable)
--- 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.2 2002-10-16 18:56:43 troup Exp $
+# Copyright (C) 2000, 2001, 2002, 2003  James Troup <james@nocrew.org>
+# $Id: kelly,v 1.6 2003-02-11 19:39:25 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.2 $";
+kelly_version = "$Revision: 1.6 $";
 
 Cnf = None;
 Options = None;
@@ -155,6 +155,13 @@ def init():
     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 +177,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
@@ -369,17 +376,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 +444,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)
@@ -551,13 +560,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 +576,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);