# Checks Debian packages from Incoming
# Copyright (C) 2000, 2001, 2002, 2003 James Troup <james@nocrew.org>
-# $Id: jennifer,v 1.32 2003-02-11 18:10:37 troup Exp $
+# $Id: jennifer,v 1.35 2003-07-29 14:00:39 ajt 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
################################################################################
# Globals
-jennifer_version = "$Revision: 1.32 $";
+jennifer_version = "$Revision: 1.35 $";
Cnf = None;
Options = None;
reject("source version (%s) for %s doesn't match changes version %s." % (source_version, file, changes["version"]));
else:
# Check in the SQL database
- if not Katie.source_exists(source_package, source_version):
+ if not Katie.source_exists(source_package, source_version, changes["distribution"].keys()):
# Check in one of the other directories
source_epochless_version = utils.re_no_epoch.sub('', source_version);
dsc_filename = "%s_%s.dsc" % (source_package, source_epochless_version);
% (filename, num_ancient_files, ancient_file,
time.ctime(ancient_date)));
except:
- reject("%s: timestamp check failed; caught %s" % (filename, sys.exc_type));
+ reject("%s: deb contents timestamp check failed [%s: %s]" % (filename, sys.exc_type, sys.exc_value));
################################################################################
################################################################################
print "Sending new ack.";
Subst["__SUMMARY__"] = summary;
new_ack_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/jennifer.new");
- utils.send_mail(new_ack_message,"");
+ utils.send_mail(new_ack_message);
# Finally remove the originals.
os.chdir (pkg.directory);