# Checks Debian packages from Incoming
# Copyright (C) 2000, 2001 James Troup <james@nocrew.org>
-# $Id: jennifer,v 1.7 2002-02-22 02:19:26 troup Exp $
+# $Id: jennifer,v 1.13 2002-04-16 17:35:16 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
################################################################################
# Globals
-jennifer_version = "$Revision: 1.7 $";
+jennifer_version = "$Revision: 1.13 $";
Cnf = None;
Options = None;
changes["chopversion"] = utils.re_no_epoch.sub('', changes["version"])
changes["chopversion2"] = utils.re_no_revision.sub('', changes["chopversion"])
- # Ensure the changes filename matches it's contents.
-
- base_filename = os.path.basename(filename);
- m = re_is_changes.match(base_filename);
- # source package name
- if m:
- file_source = m.group(1);
- if changes["source"] != file_source:
- reject("package name part of changes filename (%s) does not match source field (%s) in the changes file." % (file_source, changes["source"]));
- # source version
- file_version = m.group(2);
- if changes["chopversion"] != file_version:
- reject("version part of changes filename (%s) does not match version field (%s) in the changes file." % (file_version, changes["chopversion"]));
- else:
- reject("invalid changes filename '%s'." % (filename));
-
- # But ... we can't check architecture because there's no
- # established policy or practice on how to handle
- # multi-architecture uploads. Instead we check what we can and
- # reject if there's a changes file of the same name already in one
+ # Check there isn't already a changes file of the same name in one
# of the queue directories.
+ base_filename = os.path.basename(filename);
for dir in [ "Accepted", "Byhand", "Done", "New" ]:
if os.path.exists(Cnf["Dir::Queue%sDir" % (dir) ]+'/'+base_filename):
- reject("a changes file with the same name exists in the %s directory." % (dir));
+ reject("a changes file with the same name already exists in the %s directory." % (dir));
return 1;
if epochless_dsc_version != files[file]["version"]:
reject("version ('%s') in .dsc does not match version ('%s') in .changes." % (epochless_dsc_version, changes_version));
+ # Ensure there is a .tar.gz in the .dsc file
+ has_tar = 0;
+ for f in dsc_files.keys():
+ m = utils.re_issource.match(f);
+ if not m:
+ reject("%s mentioned in the Files field of %s not recognised as source." % (f, file));
+ type = m.group(3);
+ if type == "orig.tar.gz" or type == "tar.gz":
+ has_tar = 1;
+ if not has_tar:
+ reject("no .tar.gz or .orig.tar.gz listed in the Files field of %s." % (file));
+
# Ensure source is newer than existing source in target suites
reject(Katie.check_source_against_db(file),"");
time.ctime(ancient_date)));
except:
reject("%s: timestamp check failed; caught %s" % (filename, sys.exc_type));
- raise;
################################################################################
################################################################################
# the file is still being uploaded.
def upload_too_new():
+ too_new = 0;
+ # Move back to the original directory to get accurate time stamps
+ cwd = os.getcwd();
+ os.chdir(pkg.directory);
file_list = pkg.files.keys();
file_list.extend(pkg.dsc_files.keys());
file_list.append(pkg.changes_file);
for file in file_list:
try:
- last_modified = time.time()-os.path.getmtime(pkg.changes_file);
+ last_modified = time.time()-os.path.getmtime(file);
if last_modified < int(Cnf["Dinstall::SkipTime"]):
- return 1;
+ too_new = 1;
+ break;
except:
pass;
- return 0;
+ os.chdir(cwd);
+ return too_new;
+
+################################################################################
def action ():
# changes["distribution"] may not exist in corner cases
file_keys = files.keys();
- # Move all the files into the accepted directory
+ # Move all the files into the byhand directory
utils.move (pkg.changes_file, Cnf["Dir::QueueByhandDir"]);
for file in file_keys:
- utils.move (file, Cnf["Dir::QueueByhandDir"]);
+ utils.move (file, Cnf["Dir::QueueByhandDir"], perms=0660);
# Check for override disparities
if not Cnf["Dinstall::Options::No-Mail"]:
# Move all the files into the accepted directory
utils.move (pkg.changes_file, Cnf["Dir::QueueNewDir"]);
for file in file_keys:
- utils.move (file, Cnf["Dir::QueueNewDir"]);
+ utils.move (file, Cnf["Dir::QueueNewDir"], perms=0660);
if not Options["No-Mail"]:
print "Sending new ack.";