X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=jennifer;h=125d7d5dd70e42c774a3337a9e0d69975758b562;hb=d0a891d7eb8d79b747f031392dd29de3acd68d84;hp=96077d36976bab095edb2fc254be4f4108eecbb3;hpb=c279afcedf5878810de6280d3cb45c62e04c416d;p=dak.git diff --git a/jennifer b/jennifer index 96077d36..125d7d5d 100755 --- a/jennifer +++ b/jennifer @@ -1,8 +1,8 @@ #!/usr/bin/env python # Checks Debian packages from Incoming -# Copyright (C) 2000, 2001 James Troup -# $Id: jennifer,v 1.9 2002-03-14 14:12:04 ajt Exp $ +# Copyright (C) 2000, 2001, 2002 James Troup +# $Id: jennifer,v 1.23 2002-06-09 17:32:31 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 @@ -34,7 +34,6 @@ import apt_inst, apt_pkg; import db_access, katie, logging, utils; from types import *; -from string import lower; ################################################################################ @@ -44,7 +43,7 @@ re_is_changes = re.compile (r"(.+?)_(.+?)_(.+?)\.changes$"); ################################################################################ # Globals -jennifer_version = "$Revision: 1.9 $"; +jennifer_version = "$Revision: 1.23 $"; Cnf = None; Options = None; @@ -161,9 +160,11 @@ def get_status_output(cmd, status_read, status_write): 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; @@ -174,17 +175,6 @@ def get_status_output(cmd, status_read, status_write): def Dict(**dict): return dict -def prefix_multi_line_string(str, prefix): - out = ""; - for line in string.split(str, '\n'): - line = string.strip(line); - if line: - out = out + "%s %s\n" % (prefix, line); - # Strip trailing new line - if out: - out = out[:-1]; - return out; - def reject (str, prefix="Rejected: "): global reject_message; if str: @@ -219,7 +209,7 @@ def check_signature (filename): 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; @@ -261,9 +251,9 @@ def check_signature (filename): if exit_status: reject("gpgv failed while checking %s." % (filename)); if string.strip(status): - reject(prefix_multi_line_string(status, " [GPG status-fd output:]"), ""); + reject(utils.prefix_multi_line_string(status, " [GPG status-fd output:] "), ""); else: - reject(prefix_multi_line_string(output, " [GPG output:]"), ""); + reject(utils.prefix_multi_line_string(output, " [GPG output:] "), ""); return None; # Sanity check the good stuff we expect @@ -306,7 +296,7 @@ def copy_to_holding(filename): base_filename = os.path.basename(filename); - dest = Cnf["Dir::QueueHoldingDir"] + '/' + base_filename; + dest = Cnf["Dir::Queue::Holding"] + '/' + base_filename; try: fd = os.open(dest, os.O_RDWR|os.O_CREAT|os.O_EXCL, 0640); os.close(fd); @@ -321,7 +311,7 @@ def copy_to_holding(filename): 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': @@ -343,7 +333,7 @@ def clean_holding(): global in_holding; cwd = os.getcwd(); - os.chdir(Cnf["Dir::QueueHoldingDir"]); + os.chdir(Cnf["Dir::Queue::Holding"]); for file in in_holding.keys(): if os.path.exists(file): if string.find(file, '/') != -1: @@ -365,7 +355,7 @@ def check_changes(): # 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; @@ -375,7 +365,7 @@ def check_changes(): # 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: @@ -409,51 +399,6 @@ def check_changes(): if katie.re_isanum.match (i) == None: reject("`%s' from Closes field isn't a number." % (i)); - # Ensure there is a target distribution - if changes["distribution"].keys() == []: - reject("huh? Distribution field is empty in changes file."); - - # Map frozen to unstable if frozen doesn't exist - if changes["distribution"].has_key("frozen") and not Cnf.has_key("Suite::Frozen"): - del changes["distribution"]["frozen"] - changes["distribution"]["unstable"] = 1; - reject("Mapping frozen to unstable.",""); - - # Map testing to unstable - if changes["distribution"].has_key("testing"): - if len(changes["distribution"].keys()) > 1: - del changes["distribution"]["testing"]; - reject("Ignoring testing as a target suite.", "Warning: "); - else: - reject("invalid distribution 'testing'."); - - # Ensure target distributions exist - for i in changes["distribution"].keys(): - if not Cnf.has_key("Suite::%s" % (i)): - reject("Unknown distribution `%s'." % (i)); - - # Map unreleased arches from stable to unstable - if changes["distribution"].has_key("stable"): - for i in changes["architecture"].keys(): - if not Cnf.has_key("Suite::Stable::Architectures::%s" % (i)): - reject("Mapping stable to unstable for unreleased arch %s." % (i),""); - del changes["distribution"]["stable"]; - changes["distribution"]["unstable"] = 1; - break; - - # Map arches not being released from frozen to unstable - if changes["distribution"].has_key("frozen"): - for i in changes["architecture"].keys(): - if not Cnf.has_key("Suite::Frozen::Architectures::%s" % (i)): - reject("Mapping frozen to unstable for non-releasing arch `%s'." % (i),""); - del changes["distribution"]["frozen"] - changes["distribution"]["unstable"] = 1; - - # Map stable uploads to proposed-updates - if changes["distribution"].has_key("stable"): - reject("Mapping stable to updates.",""); - del changes["distribution"]["stable"]; - changes["distribution"]["proposed-updates"] = 1; # chopversion = no epoch; chopversion2 = no epoch and no revision (e.g. for .orig.tar.gz comparison) changes["chopversion"] = utils.re_no_epoch.sub('', changes["version"]) @@ -463,13 +408,53 @@ def check_changes(): # 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): + if os.path.exists(Cnf["Dir::Queue::%s" % (dir) ]+'/'+base_filename): reject("a changes file with the same name already exists in the %s directory." % (dir)); return 1; ################################################################################ +def check_distributions(): + "Check and map the Distribution field of a .changes file." + + # Handle suite mappings + 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 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() == []: + reject("no valid distribution."); + + # Ensure target distributions exist + for suite in changes["distribution"].keys(): + if not Cnf.has_key("Suite::%s" % (suite)): + reject("Unknown distribution `%s'." % (suite)); + +################################################################################ + def check_files(): global reprocess @@ -491,7 +476,7 @@ def check_files(): for file in file_keys: # Ensure the file does not already exist in one of the accepted directories for dir in [ "Accepted", "Byhand", "New" ]: - if os.path.exists(Cnf["Dir::Queue%sDir" % (dir) ]+'/'+file): + if os.path.exists(Cnf["Dir::Queue::%s" % (dir) ]+'/'+file): reject("%s file already exists in the %s directory." % (file, dir)); if not utils.re_taint_free.match(file): reject("!!WARNING!! tainted filename: '%s'." % (file)); @@ -515,12 +500,15 @@ def check_files(): files[file]["type"] = "deb"; # Extract package control information + deb_file = utils.open_file(file); try: - control = apt_pkg.ParseSection(apt_inst.debExtractControl(utils.open_file(file))); + control = apt_pkg.ParseSection(apt_inst.debExtractControl(deb_file)); except: reject("%s: debExtractControl() raised %s." % (file, sys.exc_type)); + deb_file.close(); # Can't continue, none of the checks on control would work. continue; + deb_file.close(); # Check for mandatory fields for field in [ "Package", "Architecture", "Version" ]: @@ -532,13 +520,15 @@ def check_files(): reject("%s: control file lists name as `%s', which isn't in changes file." % (file, control.Find("Package", ""))); # Ensure the architecture of the .deb is one we know about. - if not Cnf.has_key("Suite::Unstable::Architectures::%s" % (control.Find("Architecture", ""))): - reject("Unknown architecture '%s'." % (control.Find("Architecture", ""))); + default_suite = Cnf.get("Dinstall::DefaultSuite", "Unstable") + 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"): @@ -547,7 +537,7 @@ def check_files(): 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]["architecture"] = architecture; files[file]["version"] = control.Find("Version"); files[file]["maintainer"] = control.Find("Maintainer", ""); if file[-5:] == ".udeb": @@ -556,9 +546,7 @@ def check_files(): 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 = "" @@ -599,12 +587,14 @@ def check_files(): # 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); - if os.path.exists(Cnf["Dir::QueueByhandDir"] + '/' + dsc_filename): + if os.path.exists(Cnf["Dir::Queue::Byhand"] + '/' + dsc_filename): files[file]["byhand"] = 1; - elif os.path.exists(Cnf["Dir::QueueNewDir"] + '/' + dsc_filename): + elif os.path.exists(Cnf["Dir::Queue::New"] + '/' + dsc_filename): files[file]["new"] = 1; - elif not os.path.exists(Cnf["Dir::QueueAcceptedDir"] + '/' + dsc_filename): + 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: @@ -646,10 +636,17 @@ def check_files(): 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 @@ -657,9 +654,6 @@ def check_files(): 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); @@ -671,10 +665,14 @@ def check_files(): if string.find(files[file]["priority"],'/') != -1: reject("file '%s' has invalid priority '%s' [contains '/']." % (file, files[file]["priority"])); - # Check the md5sum & size against existing files (if any) - location = Cnf["Dir::PoolDir"]; - files[file]["location id"] = db_access.get_location_id (location, component, archive); + # Determine the location + location = Cnf["Dir::Pool"]; + location_id = db_access.get_location_id (location, component, archive); + if location_id == -1: + reject("[INTERNAL ERROR] couldn't determine location (Component: %s, Archive: %s)" % (component, archive)); + files[file]["location id"] = location_id; + # Check the md5sum & size against existing files (if any) files[file]["pool name"] = utils.poolify (changes["source"], files[file]["component"]); files_id = db_access.get_files_id(files[file]["pool name"] + file, files[file]["size"], files[file]["md5sum"], files[file]["location id"]); if files_id == -1: @@ -684,8 +682,18 @@ def check_files(): 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"): @@ -702,10 +710,14 @@ def check_dsc (): global reprocess; for file in files.keys(): + # The .orig.tar.gz can disappear out from under us is it's a + # duplicate of one in the archive. + if not files.has_key(file): + continue; 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"]: @@ -716,7 +728,7 @@ def check_dsc (): 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; @@ -743,6 +755,18 @@ def check_dsc (): 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),""); @@ -786,10 +810,10 @@ def check_urgency (): 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"] = lower(changes["urgency"]); + changes["urgency"] = string.lower(changes["urgency"]); ################################################################################ @@ -802,12 +826,13 @@ def check_md5sums (): else: if apt_pkg.md5sum(file_handle) != files[file]["md5sum"]: reject("md5sum check failed for %s." % (file)); + file_handle.close(); ################################################################################ # 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: @@ -838,6 +863,7 @@ def check_timestamps(): apt_inst.debExtract(deb_file,tar.callback,"control.tar.gz"); deb_file.seek(0); apt_inst.debExtract(deb_file,tar.callback,"data.tar.gz"); + deb_file.close(); # future_files = tar.future_files.keys(); if future_files: @@ -858,7 +884,6 @@ def check_timestamps(): time.ctime(ancient_date))); except: reject("%s: timestamp check failed; caught %s" % (filename, sys.exc_type)); - raise; ################################################################################ ################################################################################ @@ -867,17 +892,25 @@ def check_timestamps(): # 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 @@ -946,10 +979,7 @@ def action (): def accept (summary, short_summary): Katie.accept(summary, short_summary); - - # Check for override disparities - if not Cnf["Dinstall::Options::No-Mail"]: - Katie.check_override(); + Katie.check_override(); # Finally, remove the originals from the unchecked directory os.chdir (pkg.directory); @@ -963,19 +993,18 @@ def do_byhand (summary): print "Moving to BYHAND holding area." Logger.log(["Moving to byhand", pkg.changes_file]); - Katie.dump_vars(Cnf["Dir::QueueByhandDir"]); + Katie.dump_vars(Cnf["Dir::Queue::Byhand"]); file_keys = files.keys(); # Move all the files into the byhand directory - utils.move (pkg.changes_file, Cnf["Dir::QueueByhandDir"]); + utils.move (pkg.changes_file, Cnf["Dir::Queue::Byhand"]); for file in file_keys: - utils.move (file, Cnf["Dir::QueueByhandDir"], perms=0660); + utils.move (file, Cnf["Dir::Queue::Byhand"], perms=0660); # Check for override disparities - if not Cnf["Dinstall::Options::No-Mail"]: - Katie.Subst["__SUMMARY__"] = summary; - Katie.check_override(); + Katie.Subst["__SUMMARY__"] = summary; + Katie.check_override(); # Finally remove the originals. os.chdir (pkg.directory); @@ -991,19 +1020,19 @@ def acknowledge_new (summary): print "Moving to NEW holding area." Logger.log(["Moving to new", pkg.changes_file]); - Katie.dump_vars(Cnf["Dir::QueueNewDir"]); + Katie.dump_vars(Cnf["Dir::Queue::New"]); file_keys = files.keys(); - # Move all the files into the accepted directory - utils.move (pkg.changes_file, Cnf["Dir::QueueNewDir"]); + # Move all the files into the 'new' directory + utils.move (pkg.changes_file, Cnf["Dir::Queue::New"]); for file in file_keys: - utils.move (file, Cnf["Dir::QueueNewDir"], perms=0660); + utils.move (file, Cnf["Dir::Queue::New"], perms=0660); if not Options["No-Mail"]: print "Sending new ack."; Subst["__SUMMARY__"] = summary; - new_ack_message = utils.TemplateSubst(Subst,open(Cnf["Dir::TemplatesDir"]+"/jennifer.new","r").read()); + new_ack_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/jennifer.new"); utils.send_mail(new_ack_message,""); # Finally remove the originals. @@ -1043,7 +1072,7 @@ def process_it (changes_file): # If this is the Real Thing(tm), copy things into a private # holding directory first to avoid replacable file races. if not Options["No-Action"]: - os.chdir(Cnf["Dir::QueueHoldingDir"]); + os.chdir(Cnf["Dir::Queue::Holding"]); copy_to_holding(pkg.changes_file); # Relativize the filename so we use the copy in holding # rather than the original... @@ -1052,6 +1081,7 @@ def process_it (changes_file): changes_valid = check_changes(); if changes_valid: while reprocess: + check_distributions(); check_files(); check_md5sums(); check_dsc(); @@ -1099,7 +1129,7 @@ def main(): # Check that we aren't going to clash with the daily cron job - if not Options["No-Action"] and os.path.exists("%s/Archive_Maintenance_In_Progress" % (Cnf["Dir::RootDir"])) and not Options["No-Lock"]: + if not Options["No-Action"] and os.path.exists("%s/Archive_Maintenance_In_Progress" % (Cnf["Dir::Root"])) and not Options["No-Lock"]: utils.fubar("Archive maintenance in progress. Try again later."); # Obtain lock if not in no-action mode and initialize the log