# Checks Debian packages from Incoming
# Copyright (C) 2000, 2001, 2002 James Troup <james@nocrew.org>
-# $Id: jennifer,v 1.17 2002-05-10 00:24:33 troup Exp $
+# $Id: jennifer,v 1.24 2002-06-22 22:34:35 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
################################################################################
re_bad_diff = re.compile("^[\-\+][\-\+][\-\+] /dev/null");
-re_is_changes = re.compile (r"(.+?)_(.+?)_(.+?)\.changes$");
+re_is_changes = re.compile(r"(.+?)_(.+?)_(.+?)\.changes$");
+re_valid_version = re.compile(r"^([0-9]+:)?[0-9A-Za-z\.\-\+:]+$");
+re_valid_pkg_name = re.compile(r"^[\dA-Za-z][\dA-Za-z\+\-\.]+$");
################################################################################
# Globals
-jennifer_version = "$Revision: 1.17 $";
+jennifer_version = "$Revision: 1.24 $";
Cnf = None;
Options = None;
try:
os.close(status_write);
os.close(status_read);
+ os.close(c2pread);
os.close(c2pwrite);
os.close(p2cwrite);
os.close(errin);
+ os.close(errout);
except:
pass;
break;
continue;
args = split[2:];
if keywords.has_key(keyword) and keyword != "NODATA":
- internal_error = internal_error + "found duplicate status token ('%s')." % (keyword);
+ internal_error = internal_error + "found duplicate status token ('%s').\n" % (keyword);
continue;
else:
keywords[keyword] = args;
try:
shutil.copy(filename, dest);
except IOError, e:
- # In either case (ENOENT or EPERM) we want to remove the
+ # In either case (ENOENT or EACCES) we want to remove the
# O_CREAT | O_EXCLed ghost file, so add the file to the list
# of 'in holding' even if it's not the real file.
if errno.errorcode[e.errno] == 'ENOENT':
# Parse the .changes field into a dictionary
try:
- changes.update(utils.parse_changes(filename, 0));
+ changes.update(utils.parse_changes(filename));
except utils.cant_open_exc:
reject("can't read changes file '%s'." % (filename));
return 0;
# Parse the Files field from the .changes into another dictionary
try:
- files.update(utils.build_file_list(changes, ""));
+ files.update(utils.build_file_list(changes));
except utils.changes_parse_error_exc, line:
reject("error parsing changes file '%s', can't grok: %s." % (filename, line));
except utils.nk_format_exc, format:
"Check and map the Distribution field of a .changes file."
# Handle suite mappings
- if Cnf.has_key("SuiteMappings"):
- for map in Cnf.ValueList("SuiteMappings"):
- args = string.split(map);
- type = args[0];
- if type == "map":
- (source, dest) = args[1:3];
- if changes["distribution"].has_key(source):
- del changes["distribution"][source]
- changes["distribution"][dest] = 1;
+ for map in Cnf.ValueList("SuiteMappings"):
+ args = string.split(map);
+ type = args[0];
+ if type == "map" or type == "silent-map":
+ (source, dest) = args[1:3];
+ if changes["distribution"].has_key(source):
+ del changes["distribution"][source]
+ changes["distribution"][dest] = 1;
+ if type != "silent-map":
reject("Mapping %s to %s." % (source, dest),"");
- elif type == "map-unreleased":
- (source, dest) = args[1:3];
- if changes["distribution"].has_key(source):
- for arch in changes["architecture"].keys():
- if not Cnf.has_key("Suite::%s::Architectures::%s" % (source, arch)):
- reject("Mapping %s to %s for unreleased architecture %s." % (source, dest, arch),"");
- del changes["distribution"][source];
- changes["distribution"][dest] = 1;
- break;
- elif type == "ignore":
- suite = args[1];
- if changes["distribution"].has_key(suite):
- del changes["distribution"][suite];
- reject("Ignoring %s as a target suite." % (suite), "Warning: ");
+ elif type == "map-unreleased":
+ (source, dest) = args[1:3];
+ if changes["distribution"].has_key(source):
+ for arch in changes["architecture"].keys():
+ if arch not in Cnf.ValueList("Suite::%s::Architectures" % (source)):
+ reject("Mapping %s to %s for unreleased architecture %s." % (source, dest, arch),"");
+ del changes["distribution"][source];
+ changes["distribution"][dest] = 1;
+ break;
+ elif type == "ignore":
+ suite = args[1];
+ if changes["distribution"].has_key(suite):
+ del changes["distribution"][suite];
+ reject("Ignoring %s as a target suite." % (suite), "Warning: ");
# Ensure there is (still) a target distribution
if changes["distribution"].keys() == []:
for field in [ "Package", "Architecture", "Version" ]:
if control.Find(field) == None:
reject("%s: No %s field in control." % (file, field));
+ # Can't continue
+ continue;
# Ensure the package name matches the one give in the .changes
if not changes["binary"].has_key(control.Find("Package", "")):
reject("%s: control file lists name as `%s', which isn't in changes file." % (file, control.Find("Package", "")));
+ # Validate the package field
+ package = control.Find("Package");
+ if not re_valid_pkg_name.match(package):
+ reject("%s: invalid package name '%s'." % (file, package));
+
+ # Validate the version field
+ version = control.Find("Version");
+ if not re_valid_version.match(version):
+ reject("%s: invalid version number '%s'." % (file, version));
+
# Ensure the architecture of the .deb is one we know about.
default_suite = Cnf.get("Dinstall::DefaultSuite", "Unstable")
- if not Cnf.has_key("Suite::%s::Architectures::%s" % (default_suite, control.Find("Architecture", ""))):
- reject("Unknown architecture '%s'." % (control.Find("Architecture", "")));
+ architecture = control.Find("Architecture");
+ if architecture not in Cnf.ValueList("Suite::%s::Architectures" % (default_suite)):
+ reject("Unknown architecture '%s'." % (architecture));
# Ensure the architecture of the .deb is one of the ones
# listed in the .changes.
- if not changes["architecture"].has_key(control.Find("Architecture", "")):
- reject("%s: control file lists arch as `%s', which isn't in changes file." % (file, control.Find("Architecture", "")));
+ if not changes["architecture"].has_key(architecture):
+ reject("%s: control file lists arch as `%s', which isn't in changes file." % (file, architecture));
# Check the section & priority match those given in the .changes (non-fatal)
if control.Find("Section") != None and files[file]["section"] != "" and files[file]["section"] != control.Find("Section"):
if control.Find("Priority") != None and files[file]["priority"] != "" and files[file]["priority"] != control.Find("Priority"):
reject("%s control file lists priority as `%s', but changes file has `%s'." % (file, control.Find("Priority", ""), files[file]["priority"]),"Warning: ");
- files[file]["package"] = control.Find("Package");
- files[file]["architecture"] = control.Find("Architecture");
- files[file]["version"] = control.Find("Version");
+ files[file]["package"] = package;
+ files[file]["architecture"] = architecture;
+ files[file]["version"] = version;
files[file]["maintainer"] = control.Find("Maintainer", "");
if file[-5:] == ".udeb":
files[file]["dbtype"] = "udeb";
files[file]["dbtype"] = "deb";
else:
reject("%s is neither a .deb or a .udeb." % (file));
- files[file]["source"] = control.Find("Source", "");
- if files[file]["source"] == "":
- files[file]["source"] = files[file]["package"];
+ files[file]["source"] = control.Find("Source", files[file]["package"]);
# Get the source version
source = files[file]["source"];
source_version = ""
file_package = m.group(1);
if files[file]["package"] != file_package:
reject("%s: package part of filename (%s) does not match package name in the %s (%s)." % (file, file_package, files[file]["dbtype"], files[file]["package"]));
- epochless_version = utils.re_no_epoch.sub('', control.Find("Version", ""))
+ epochless_version = utils.re_no_epoch.sub('', control.Find("Version"));
# version
file_version = m.group(2);
if epochless_version != file_version:
files[file]["new"] = 1;
elif not os.path.exists(Cnf["Dir::Queue::Accepted"] + '/' + dsc_filename):
reject("no source found for %s %s (%s)." % (source_package, source_version, file));
+ # Check the version and for file overwrites
+ reject(Katie.check_binary_against_db(file),"");
# Checks for a source package...
else:
for suite in changes["distribution"].keys():
# Skip byhand
if files[file].has_key("byhand"):
- continue
+ continue;
+ # Handle component mappings
+ for map in Cnf.ValueList("ComponentMappings"):
+ (source, dest) = string.split(map);
+ if files[file]["component"] == source:
+ files[file]["original component"] = source;
+ files[file]["component"] = dest;
# Ensure the component is valid for the target suite
- if Cnf.has_key("Suite:%s::Components" % (suite)) and not Cnf.has_key("Suite::%s::Components::%s" % (suite, files[file]["component"])):
+ if Cnf.has_key("Suite:%s::Components" % (suite)) and \
+ files[file]["component"] not in Cnf.ValueList("Suite::%s::Components" % (suite)):
reject("unknown component `%s' for suite `%s'." % (files[file]["component"], suite));
continue
if not Katie.in_override_p(files[file]["package"], files[file]["component"], suite, files[file].get("dbtype",""), file):
files[file]["new"] = 1;
- if files[file]["type"] == "deb":
- reject(Katie.check_binaries_against_db(file, suite),"");
-
# Validate the component
component = files[file]["component"];
component_id = db_access.get_component_id(component);
files[file]["files id"] = files_id
# Check for packages that have moved from one component to another
- if files[file]["oldfiles"].has_key(suite) and files[file]["oldfiles"][suite]["name"] != files[file]["component"]:
- files[file]["othercomponents"] = files[file]["oldfiles"][suite]["name"];
+ q = Katie.projectB.query("""
+SELECT c.name FROM binaries b, bin_associations ba, suite s, location l,
+ component c, architecture a, files f
+ WHERE b.package = '%s' AND s.suite_name = '%s'
+ AND (a.arch_string = '%s' OR a.arch_string = 'all')
+ AND ba.bin = b.id AND ba.suite = s.id AND b.architecture = a.id
+ AND f.location = l.id AND l.component = c.id AND b.file = f.id"""
+ % (files[file]["package"], suite,
+ files[file]["architecture"]));
+ ql = q.getresult();
+ if ql:
+ files[file]["othercomponents"] = ql[0][0];
# If the .changes file says it has source, it must have source.
if changes["architecture"].has_key("source"):
if files[file]["type"] == "dsc":
# Parse the .dsc file
try:
- dsc.update(utils.parse_changes(file, 1));
+ dsc.update(utils.parse_changes(file, dsc_whitespace_rules=1));
except utils.cant_open_exc:
# if not -n copy_to_holding() will have done this for us...
if Options["No-Action"]:
reject("syntax error in .dsc file '%s', line %s." % (file, line));
# Build up the file list of files mentioned by the .dsc
try:
- dsc_files.update(utils.build_file_list(dsc, 1));
+ dsc_files.update(utils.build_file_list(dsc, is_a_dsc=1));
except utils.no_files_exc:
reject("no Files: field in .dsc file.");
continue;
if not dsc.has_key(i):
reject("Missing field `%s' in dsc file." % (i));
+ # Validate the source and version fields
+ if dsc.has_key("source") and not re_valid_pkg_name.match(dsc["source"]):
+ reject("%s: invalid source name '%s'." % (file, dsc["source"]));
+ if dsc.has_key("version") and not re_valid_version.match(dsc["version"]):
+ reject("%s: invalid version number '%s'." % (file, dsc["version"]));
+
# The dpkg maintainer from hell strikes again! Bumping the
# version number of the .dsc breaks extraction by stable's
# dpkg-source.
if changes["architecture"].has_key("source"):
if not changes.has_key("urgency"):
changes["urgency"] = Cnf["Urgency::Default"];
- if not Cnf.has_key("Urgency::Valid::%s" % changes["urgency"]):
+ if changes["urgency"] not in Cnf.ValueList("Urgency::Valid"):
reject("%s is not a valid urgency; it will be treated as %s by testing." % (changes["urgency"], Cnf["Urgency::Default"]), "Warning: ");
changes["urgency"] = Cnf["Urgency::Default"];
changes["urgency"] = string.lower(changes["urgency"]);
# Sanity check the time stamps of files inside debs.
# [Files in the near future cause ugly warnings and extreme time
-# travel can causes errors on extraction]
+# travel can cause errors on extraction]
def check_timestamps():
class Tar:
projects / dak.git / blobdiff