From 63d91e6f17acde90e48b639316b6ada7267fd759 Mon Sep 17 00:00:00 2001
From: James Troup <james@nocrew.org>
Date: Wed, 24 Sep 2003 00:13:43 +0000
Subject: [PATCH] utils.move() dies if it can't overwrite.  adjust kelly to
 match.

---
 kelly    | 11 +++++------
 utils.py |  6 +++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/kelly b/kelly
index b9f02911..78d4519d 100755
--- a/kelly
+++ b/kelly
@@ -2,7 +2,7 @@
 
 # Installs Debian packages
 # Copyright (C) 2000, 2001, 2002, 2003  James Troup <james@nocrew.org>
-# $Id: kelly,v 1.11 2003-09-17 23:36:17 troup Exp $
+# $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
@@ -39,7 +39,7 @@ import db_access, katie, logging, utils;
 ###############################################################################
 
 # Globals
-kelly_version = "$Revision: 1.11 $";
+kelly_version = "$Revision: 1.12 $";
 
 Cnf = None;
 Options = None;
@@ -394,11 +394,10 @@ def install ():
     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:
diff --git a/utils.py b/utils.py
index c5571a67..59d5fe50 100644
--- a/utils.py
+++ b/utils.py
@@ -2,7 +2,7 @@
 
 # Utility functions
 # Copyright (C) 2000, 2001, 2002, 2003  James Troup <james@nocrew.org>
-# $Id: utils.py,v 1.58 2003-09-07 13:54:20 troup Exp $
+# $Id: utils.py,v 1.59 2003-09-24 00:13:43 troup Exp $
 
 ################################################################################
 
@@ -327,10 +327,10 @@ def move (src, dest, overwrite = 0, perms = 0664):
     # Don't overwrite unless forced to
     if os.path.exists(dest):
         if not overwrite:
-            raise file_exists_exc;
+            fubar("Can't move %s to %s - file already exists." % (src, dest));
         else:
             if not os.access(dest, os.W_OK):
-                raise cant_overwrite_exc
+                fubar("Can't move %s to %s - can't write to existing file." % (src, dest));
     shutil.copy2(src, dest);
     os.chmod(dest, perms);
     os.unlink(src);
-- 
2.39.5