# Utility functions for katie
# Copyright (C) 2001 James Troup <james@nocrew.org>
-# $Id: katie.py,v 1.4 2002-02-15 04:01:14 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
## 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" ]:
- if d_changes.has_key(i):
+ 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
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 = "";
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() != []:
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);