sync

[dak.git] / kelly

diff --git a/kelly b/kelly
index 80f1b204c272f9a65cd86642c5ddf4bfe717e505..807518882123bd7f9a6068228dc9300bb6e8b8a9 100755 (executable)
--- a/kelly
+++ b/kelly
@@ -2,7 +2,7 @@
 
 # Installs Debian packages
 # Copyright (C) 2000, 2001, 2002  James Troup <james@nocrew.org>
-# $Id: kelly,v 1.1 2002-10-16 02:47:32 troup Exp $
+# $Id: kelly,v 1.3 2002-11-19 03:15:20 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.1 $";
+kelly_version = "$Revision: 1.3 $";
 
 Cnf = None;
 Options = None;
@@ -125,7 +125,7 @@ def check():
             elif files[file]["type"] == "dsc":
                 reject(Katie.check_source_against_db(file));
                 (reject_msg, is_in_incoming) = Katie.check_dsc_against_db(file);
-                reject(reject_msg);
+                reject(reject_msg, "");
 
         # Check the package is still in the override tables
         for suite in changes["distribution"].keys():
@@ -369,17 +369,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");