X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.py;h=c6952343d2f04ae6aa45d93454c480ba1a4be41f;hb=58afa1216ab7e85f70adbb62c0a485304b42ae82;hp=e8569cc03b92bda37245456ccf6bf8a0eef46490;hpb=aeee9ede7c6fd7d3d7ff77f776be7813060c02cb;p=dak.git

diff --git a/katie.py b/katie.py
index e8569cc0..c6952343 100644
--- a/katie.py
+++ b/katie.py
@@ -2,7 +2,7 @@
 
 # Utility functions for katie
 # Copyright (C) 2001  James Troup <james@nocrew.org>
-# $Id: katie.py,v 1.5 2002-02-15 04:16:13 troup Exp $
+# $Id: katie.py,v 1.7 2002-02-22 01:03:13 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
@@ -158,14 +158,15 @@ class Katie:
         ## changes
         # Mandatory changes fields
         for i in [ "distribution", "source", "architecture", "version", "maintainer",
-                   "urgency", "fingerprint" ]:
+                   "urgency", "fingerprint", "changedby822", "changedbyname",
+                   "maintainername", "maintaineremail", "closes" ]:
             d_changes[i] = changes[i];
         # Optional changes fields
-        for i in [ "changed-by", "changedby822", "maintainer822", "filecontents" ]:
+        for i in [ "changed-by", "maintainer822", "filecontents", "format" ]:
             if changes.has_key(i):
                 d_changes[i] = changes[i];
         ## dsc
-        for i in [ "source", "version", "maintainer", "fingerprint" ]:
+        for i in [ "source", "version", "maintainer", "fingerprint", "uploaders" ]:
             if dsc.has_key(i):
                 d_dsc[i] = dsc[i];
         ## dsc_files
@@ -562,7 +563,11 @@ class Katie:
 
     def reject (self, str, prefix="Rejected: "):
         if str:
-            self.reject_message = self.reject_message + prefix + str + "\n";
+            # Unlike other rejects we add new lines first to avoid trailing
+            # new lines when this message is passed back up to a caller.
+            if self.reject_message:
+                self.reject_message = self.reject_message + "\n";
+            self.reject_message = self.reject_message + prefix + str;
 
     def check_binaries_against_db(self, file, suite):
         self.reject_message = "";
@@ -575,7 +580,7 @@ class Katie:
             files[file]["oldfiles"][suite] = oldfile;
             # Check versions [NB: per-suite only; no cross-suite checking done (yet)]
             if apt_pkg.VersionCompare(files[file]["version"], oldfile["version"]) != 1:
-                self.reject("%s Old version `%s' >= new version `%s'." % (file, oldfile["version"], files[file]["version"]));
+                self.reject("%s: old version (%s) >= new version (%s)." % (file, oldfile["version"], files[file]["version"]));
         # Check for any existing copies of the file
         q = self.projectB.query("SELECT b.id FROM binaries b, architecture a WHERE b.package = '%s' AND b.version = '%s' AND a.arch_string = '%s' AND a.id = b.architecture" % (files[file]["package"], files[file]["version"], files[file]["architecture"]))
         if q.getresult() != []:
@@ -675,7 +680,7 @@ class Katie:
                     in_unchecked = os.path.join(self.Cnf["Dir::QueueUncheckedDir"],dsc_file);
                     # See process_it() in jennifer for explanation of this
                     if os.path.exists(in_unchecked):
-                        return (self.reject_message, orig_tar_gz);
+                        return (self.reject_message, in_unchecked);
                     else:
                         for dir in [ "Accepted", "New", "Byhand" ]:
                             in_otherdir = os.path.join(self.Cnf["Dir::Queue%sDir" % (dir)],dsc_file);