X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fprocess_unchecked.py;h=5463f1a6521a7219332614396359719b13aca514;hb=fb11aec0c46bae0797a4e32b1d19eb6fcbc07c49;hp=bc13f684d6a5c787ba062fc1c6f3c725a69f6194;hpb=c94572ee95a317ddf25fa0820d387625508acc14;p=dak.git diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py index bc13f684..5463f1a6 100755 --- a/dak/process_unchecked.py +++ b/dak/process_unchecked.py @@ -5,6 +5,7 @@ Checks Debian packages from Incoming @contact: Debian FTP Master @copyright: 2000, 2001, 2002, 2003, 2004, 2005, 2006 James Troup @copyright: 2009 Joerg Jaspert +@copyright: 2009 Mark Hymers @license: GNU General Public License version 2 or later """ @@ -33,31 +34,23 @@ Checks Debian packages from Incoming ################################################################################ -import commands import errno import fcntl import os -import re -import shutil -import stat import sys -import time import traceback -import tarfile -import apt_inst import apt_pkg -from debian_bundle import deb822 + from daklib.dbconn import * -from daklib.binary import Binary from daklib import daklog -from daklib import queue +from daklib.queue import * from daklib import utils from daklib.textutils import fix_maintainer from daklib.dak_exceptions import * -from daklib.regexes import re_valid_version, re_valid_pkg_name, re_changelog_versions, \ - re_strip_revision, re_strip_srcver, re_spacestrip, \ - re_isanum, re_no_epoch, re_no_revision, re_taint_free, \ - re_isadeb, re_extract_src_version, re_issource, re_default_answer +from daklib.regexes import re_default_answer +from daklib.summarystats import SummaryStats +from daklib.holding import Holding +from daklib.config import Config from types import * @@ -67,31 +60,16 @@ from types import * ################################################################################ # Globals -Cnf = None Options = None Logger = None -Upload = None - -reprocess = 0 -in_holding = {} - -# Aliases to the real vars in the Upload class; hysterical raisins. -reject_message = "" -changes = {} -dsc = {} -dsc_files = {} -files = {} -pkg = {} ############################################################################### def init(): - global Cnf, Options, Upload, changes, dsc, dsc_files, files, pkg + global Options apt_pkg.init() - - Cnf = apt_pkg.newConfiguration() - apt_pkg.ReadConfigFileISC(Cnf,utils.which_conf_file()) + cnf = Config() Arguments = [('a',"automatic","Dinstall::Options::Automatic"), ('h',"help","Dinstall::Options::Help"), @@ -102,30 +80,22 @@ def init(): for i in ["automatic", "help", "no-action", "no-lock", "no-mail", "override-distribution", "version", "directory"]: - Cnf["Dinstall::Options::%s" % (i)] = "" + cnf["Dinstall::Options::%s" % (i)] = "" - changes_files = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv) - Options = Cnf.SubTree("Dinstall::Options") + changes_files = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv) + Options = cnf.SubTree("Dinstall::Options") if Options["Help"]: usage() # If we have a directory flag, use it to find our files - if Cnf["Dinstall::Options::Directory"] != "": + if cnf["Dinstall::Options::Directory"] != "": # Note that we clobber the list of files we were given in this case # so warn if the user has done both if len(changes_files) > 0: utils.warn("Directory provided so ignoring files given on command line") - changes_files = utils.get_changes_files(Cnf["Dinstall::Options::Directory"]) - - Upload = queue.Upload(Cnf) - - changes = Upload.pkg.changes - dsc = Upload.pkg.dsc - dsc_files = Upload.pkg.dsc_files - files = Upload.pkg.files - pkg = Upload.pkg + changes_files = utils.get_changes_files(cnf["Dinstall::Options::Directory"]) return changes_files @@ -143,1005 +113,15 @@ def usage (exit_code=0): ################################################################################ -def reject (str, prefix="Rejected: "): - global reject_message - if str: - reject_message += prefix + str + "\n" - -################################################################################ - -def copy_to_holding(filename): - global in_holding - - base_filename = os.path.basename(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) - except OSError, e: - # Shouldn't happen, but will if, for example, someone lists a - # file twice in the .changes. - if errno.errorcode[e.errno] == 'EEXIST': - reject("%s: already exists in holding area; can not overwrite." % (base_filename)) - return - raise - - try: - shutil.copy(filename, dest) - except IOError, e: - # 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': - reject("%s: can not copy to holding area: file not found." % (base_filename)) - os.unlink(dest) - return - elif errno.errorcode[e.errno] == 'EACCES': - reject("%s: can not copy to holding area: read permission denied." % (base_filename)) - os.unlink(dest) - return - raise - - in_holding[base_filename] = "" - -################################################################################ - -def clean_holding(): - global in_holding - - cwd = os.getcwd() - os.chdir(Cnf["Dir::Queue::Holding"]) - for f in in_holding.keys(): - if os.path.exists(f): - if f.find('/') != -1: - utils.fubar("WTF? clean_holding() got a file ('%s') with / in it!" % (f)) - else: - os.unlink(f) - in_holding = {} - os.chdir(cwd) - -################################################################################ - -def check_changes(): - filename = pkg.changes_file - - # Parse the .changes field into a dictionary - try: - changes.update(utils.parse_changes(filename)) - except CantOpenError: - reject("%s: can't read file." % (filename)) - return 0 - except ParseChangesError, line: - reject("%s: parse error, can't grok: %s." % (filename, line)) - return 0 - except ChangesUnicodeError: - reject("%s: changes file not proper utf-8" % (filename)) - return 0 - - # Parse the Files field from the .changes into another dictionary - try: - files.update(utils.build_file_list(changes)) - except ParseChangesError, line: - reject("%s: parse error, can't grok: %s." % (filename, line)) - except UnknownFormatError, format: - reject("%s: unknown format '%s'." % (filename, format)) - return 0 - - # Check for mandatory fields - for i in ("source", "binary", "architecture", "version", "distribution", - "maintainer", "files", "changes", "description"): - if not changes.has_key(i): - reject("%s: Missing mandatory field `%s'." % (filename, i)) - return 0 # Avoid errors during later tests - - # Strip a source version in brackets from the source field - if re_strip_srcver.search(changes["source"]): - changes["source"] = re_strip_srcver.sub('', changes["source"]) - - # Ensure the source field is a valid package name. - if not re_valid_pkg_name.match(changes["source"]): - reject("%s: invalid source name '%s'." % (filename, changes["source"])) - - # Split multi-value fields into a lower-level dictionary - for i in ("architecture", "distribution", "binary", "closes"): - o = changes.get(i, "") - if o != "": - del changes[i] - changes[i] = {} - for j in o.split(): - changes[i][j] = 1 - - # Fix the Maintainer: field to be RFC822/2047 compatible - try: - (changes["maintainer822"], changes["maintainer2047"], - changes["maintainername"], changes["maintaineremail"]) = \ - fix_maintainer (changes["maintainer"]) - except ParseMaintError, msg: - reject("%s: Maintainer field ('%s') failed to parse: %s" \ - % (filename, changes["maintainer"], msg)) - - # ...likewise for the Changed-By: field if it exists. - try: - (changes["changedby822"], changes["changedby2047"], - changes["changedbyname"], changes["changedbyemail"]) = \ - fix_maintainer (changes.get("changed-by", "")) - except ParseMaintError, msg: - (changes["changedby822"], changes["changedby2047"], - changes["changedbyname"], changes["changedbyemail"]) = \ - ("", "", "", "") - reject("%s: Changed-By field ('%s') failed to parse: %s" \ - % (filename, changes["changed-by"], msg)) - - # Ensure all the values in Closes: are numbers - if changes.has_key("closes"): - for i in changes["closes"].keys(): - if re_isanum.match (i) == None: - reject("%s: `%s' from Closes field isn't a number." % (filename, i)) - - - # chopversion = no epoch; chopversion2 = no epoch and no revision (e.g. for .orig.tar.gz comparison) - changes["chopversion"] = re_no_epoch.sub('', changes["version"]) - changes["chopversion2"] = re_no_revision.sub('', changes["chopversion"]) - - # 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 d in [ "Accepted", "Byhand", "Done", "New", "ProposedUpdates", "OldProposedUpdates" ]: - if os.path.exists(Cnf["Dir::Queue::%s" % (d) ]+'/'+base_filename): - reject("%s: a file with this name already exists in the %s directory." % (base_filename, d)) - - # Check the .changes is non-empty - if not files: - reject("%s: nothing to do (Files field is empty)." % (base_filename)) - return 0 - - return 1 - -################################################################################ - -def check_distributions(): - "Check and map the Distribution field of a .changes file." - - # Handle suite mappings - for m in Cnf.ValueList("SuiteMappings"): - args = m.split() - mtype = args[0] - if mtype == "map" or mtype == "silent-map": - (source, dest) = args[1:3] - if changes["distribution"].has_key(source): - del changes["distribution"][source] - changes["distribution"][dest] = 1 - if mtype != "silent-map": - reject("Mapping %s to %s." % (source, dest),"") - if changes.has_key("distribution-version"): - if changes["distribution-version"].has_key(source): - changes["distribution-version"][source]=dest - elif mtype == "map-unreleased": - (source, dest) = args[1:3] - if changes["distribution"].has_key(source): - for arch in changes["architecture"].keys(): - if arch not in [ a.arch_string for a in get_suite_architectures(source) ]: - reject("Mapping %s to %s for unreleased architecture %s." % (source, dest, arch),"") - del changes["distribution"][source] - changes["distribution"][dest] = 1 - break - elif mtype == "ignore": - suite = args[1] - if changes["distribution"].has_key(suite): - del changes["distribution"][suite] - reject("Ignoring %s as a target suite." % (suite), "Warning: ") - elif mtype == "reject": - suite = args[1] - if changes["distribution"].has_key(suite): - reject("Uploads to %s are not accepted." % (suite)) - elif mtype == "propup-version": - # give these as "uploaded-to(non-mapped) suites-to-add-when-upload-obsoletes" - # - # changes["distribution-version"] looks like: {'testing': 'testing-proposed-updates'} - if changes["distribution"].has_key(args[1]): - changes.setdefault("distribution-version", {}) - for suite in args[2:]: changes["distribution-version"][suite]=suite - - # 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 - - archive = utils.where_am_i() - file_keys = files.keys() - - # if reprocess is 2 we've already done this and we're checking - # things again for the new .orig.tar.gz. - # [Yes, I'm fully aware of how disgusting this is] - if not Options["No-Action"] and reprocess < 2: - cwd = os.getcwd() - os.chdir(pkg.directory) - for f in file_keys: - copy_to_holding(f) - os.chdir(cwd) - - # Check there isn't already a .changes or .dak file of the same name in - # the proposed-updates "CopyChanges" or "CopyDotDak" storage directories. - # [NB: this check must be done post-suite mapping] - base_filename = os.path.basename(pkg.changes_file) - dot_dak_filename = base_filename[:-8]+".dak" - for suite in changes["distribution"].keys(): - copychanges = "Suite::%s::CopyChanges" % (suite) - if Cnf.has_key(copychanges) and \ - os.path.exists(Cnf[copychanges]+"/"+base_filename): - reject("%s: a file with this name already exists in %s" \ - % (base_filename, Cnf[copychanges])) - - copy_dot_dak = "Suite::%s::CopyDotDak" % (suite) - if Cnf.has_key(copy_dot_dak) and \ - os.path.exists(Cnf[copy_dot_dak]+"/"+dot_dak_filename): - reject("%s: a file with this name already exists in %s" \ - % (dot_dak_filename, Cnf[copy_dot_dak])) - - reprocess = 0 - has_binaries = 0 - has_source = 0 - - s = DBConn().session() - - for f in file_keys: - # Ensure the file does not already exist in one of the accepted directories - for d in [ "Accepted", "Byhand", "New", "ProposedUpdates", "OldProposedUpdates", "Embargoed", "Unembargoed" ]: - if not Cnf.has_key("Dir::Queue::%s" % (d)): continue - if os.path.exists(Cnf["Dir::Queue::%s" % (d) ] + '/' + f): - reject("%s file already exists in the %s directory." % (f, d)) - if not re_taint_free.match(f): - reject("!!WARNING!! tainted filename: '%s'." % (f)) - # Check the file is readable - if os.access(f, os.R_OK) == 0: - # When running in -n, copy_to_holding() won't have - # generated the reject_message, so we need to. - if Options["No-Action"]: - if os.path.exists(f): - reject("Can't read `%s'. [permission denied]" % (f)) - else: - reject("Can't read `%s'. [file not found]" % (f)) - files[f]["type"] = "unreadable" - continue - # If it's byhand skip remaining checks - if files[f]["section"] == "byhand" or files[f]["section"][:4] == "raw-": - files[f]["byhand"] = 1 - files[f]["type"] = "byhand" - # Checks for a binary package... - elif re_isadeb.match(f): - has_binaries = 1 - files[f]["type"] = "deb" - - # Extract package control information - deb_file = utils.open_file(f) - try: - control = apt_pkg.ParseSection(apt_inst.debExtractControl(deb_file)) - except: - reject("%s: debExtractControl() raised %s." % (f, sys.exc_type)) - deb_file.close() - # Can't continue, none of the checks on control would work. - continue - - # Check for mandantory "Description:" - deb_file.seek ( 0 ) - try: - apt_pkg.ParseSection(apt_inst.debExtractControl(deb_file))["Description"] + '\n' - except: - reject("%s: Missing Description in binary package" % (f)) - continue - - deb_file.close() - - # Check for mandatory fields - for field in [ "Package", "Architecture", "Version" ]: - if control.Find(field) == None: - reject("%s: No %s field in control." % (f, 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." % (f, 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'." % (f, package)) - - # Validate the version field - version = control.Find("Version") - if not re_valid_version.match(version): - reject("%s: invalid version number '%s'." % (f, version)) - - # Ensure the architecture of the .deb is one we know about. - default_suite = Cnf.get("Dinstall::DefaultSuite", "Unstable") - architecture = control.Find("Architecture") - upload_suite = changes["distribution"].keys()[0] - if architecture not in [a.arch_string for a in get_suite_architectures(default_suite)] \ - and architecture not in [a.arch_string for a in get_suite_architectures(upload_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(architecture): - reject("%s: control file lists arch as `%s', which isn't in changes file." % (f, architecture)) - - # Sanity-check the Depends field - depends = control.Find("Depends") - if depends == '': - reject("%s: Depends field is empty." % (f)) - - # Sanity-check the Provides field - provides = control.Find("Provides") - if provides: - provide = re_spacestrip.sub('', provides) - if provide == '': - reject("%s: Provides field is empty." % (f)) - prov_list = provide.split(",") - for prov in prov_list: - if not re_valid_pkg_name.match(prov): - reject("%s: Invalid Provides field content %s." % (f, prov)) - - - # Check the section & priority match those given in the .changes (non-fatal) - if control.Find("Section") and files[f]["section"] != "" and files[f]["section"] != control.Find("Section"): - reject("%s control file lists section as `%s', but changes file has `%s'." % (f, control.Find("Section", ""), files[f]["section"]), "Warning: ") - if control.Find("Priority") and files[f]["priority"] != "" and files[f]["priority"] != control.Find("Priority"): - reject("%s control file lists priority as `%s', but changes file has `%s'." % (f, control.Find("Priority", ""), files[f]["priority"]),"Warning: ") - - files[f]["package"] = package - files[f]["architecture"] = architecture - files[f]["version"] = version - files[f]["maintainer"] = control.Find("Maintainer", "") - if f.endswith(".udeb"): - files[f]["dbtype"] = "udeb" - elif f.endswith(".deb"): - files[f]["dbtype"] = "deb" - else: - reject("%s is neither a .deb or a .udeb." % (f)) - files[f]["source"] = control.Find("Source", files[f]["package"]) - # Get the source version - source = files[f]["source"] - source_version = "" - if source.find("(") != -1: - m = re_extract_src_version.match(source) - source = m.group(1) - source_version = m.group(2) - if not source_version: - source_version = files[f]["version"] - files[f]["source package"] = source - files[f]["source version"] = source_version - - # Ensure the filename matches the contents of the .deb - m = re_isadeb.match(f) - # package name - file_package = m.group(1) - if files[f]["package"] != file_package: - reject("%s: package part of filename (%s) does not match package name in the %s (%s)." % (f, file_package, files[f]["dbtype"], files[f]["package"])) - epochless_version = re_no_epoch.sub('', control.Find("Version")) - # version - file_version = m.group(2) - if epochless_version != file_version: - reject("%s: version part of filename (%s) does not match package version in the %s (%s)." % (f, file_version, files[f]["dbtype"], epochless_version)) - # architecture - file_architecture = m.group(3) - if files[f]["architecture"] != file_architecture: - reject("%s: architecture part of filename (%s) does not match package architecture in the %s (%s)." % (f, file_architecture, files[f]["dbtype"], files[f]["architecture"])) - - # Check for existent source - source_version = files[f]["source version"] - source_package = files[f]["source package"] - if changes["architecture"].has_key("source"): - if source_version != changes["version"]: - reject("source version (%s) for %s doesn't match changes version %s." % (source_version, f, changes["version"])) - else: - # Check in the SQL database - if not Upload.source_exists(source_package, source_version, changes["distribution"].keys()): - # Check in one of the other directories - source_epochless_version = re_no_epoch.sub('', source_version) - dsc_filename = "%s_%s.dsc" % (source_package, source_epochless_version) - if os.path.exists(Cnf["Dir::Queue::Byhand"] + '/' + dsc_filename): - files[f]["byhand"] = 1 - elif os.path.exists(Cnf["Dir::Queue::New"] + '/' + dsc_filename): - files[f]["new"] = 1 - else: - dsc_file_exists = 0 - for myq in ["Accepted", "Embargoed", "Unembargoed", "ProposedUpdates", "OldProposedUpdates"]: - if Cnf.has_key("Dir::Queue::%s" % (myq)): - if os.path.exists(Cnf["Dir::Queue::"+myq] + '/' + dsc_filename): - dsc_file_exists = 1 - break - if not dsc_file_exists: - reject("no source found for %s %s (%s)." % (source_package, source_version, f)) - # Check the version and for file overwrites - reject(Upload.check_binary_against_db(f),"") - - Binary(f, reject).scan_package() - - # Checks for a source package... - else: - m = re_issource.match(f) - if m: - has_source = 1 - files[f]["package"] = m.group(1) - files[f]["version"] = m.group(2) - files[f]["type"] = m.group(3) - - # Ensure the source package name matches the Source filed in the .changes - if changes["source"] != files[f]["package"]: - reject("%s: changes file doesn't say %s for Source" % (f, files[f]["package"])) - - # Ensure the source version matches the version in the .changes file - if files[f]["type"] == "orig.tar.gz": - changes_version = changes["chopversion2"] - else: - changes_version = changes["chopversion"] - if changes_version != files[f]["version"]: - reject("%s: should be %s according to changes file." % (f, changes_version)) - - # Ensure the .changes lists source in the Architecture field - if not changes["architecture"].has_key("source"): - reject("%s: changes file doesn't list `source' in Architecture field." % (f)) - - # Check the signature of a .dsc file - if files[f]["type"] == "dsc": - dsc["fingerprint"] = utils.check_signature(f, reject) - - files[f]["architecture"] = "source" - - # Not a binary or source package? Assume byhand... - else: - files[f]["byhand"] = 1 - files[f]["type"] = "byhand" - - # Per-suite file checks - files[f]["oldfiles"] = {} - for suite in changes["distribution"].keys(): - # Skip byhand - if files[f].has_key("byhand"): - continue - - # Handle component mappings - for m in Cnf.ValueList("ComponentMappings"): - (source, dest) = m.split() - if files[f]["component"] == source: - files[f]["original component"] = source - files[f]["component"] = dest - - # Ensure the component is valid for the target suite - if Cnf.has_key("Suite:%s::Components" % (suite)) and \ - files[f]["component"] not in Cnf.ValueList("Suite::%s::Components" % (suite)): - reject("unknown component `%s' for suite `%s'." % (files[f]["component"], suite)) - continue - - # Validate the component - component = files[f]["component"] - component_id = DBConn().get_component_id(component) - if component_id == -1: - reject("file '%s' has unknown component '%s'." % (f, component)) - continue - - # See if the package is NEW - if not Upload.in_override_p(files[f]["package"], files[f]["component"], suite, files[f].get("dbtype",""), f): - files[f]["new"] = 1 - - # Validate the priority - if files[f]["priority"].find('/') != -1: - reject("file '%s' has invalid priority '%s' [contains '/']." % (f, files[f]["priority"])) - - # Determine the location - location = Cnf["Dir::Pool"] - location_id = DBConn().get_location_id(location, component, archive) - if location_id == -1: - reject("[INTERNAL ERROR] couldn't determine location (Component: %s, Archive: %s)" % (component, archive)) - files[f]["location id"] = location_id - - # Check the md5sum & size against existing files (if any) - files[f]["pool name"] = utils.poolify (changes["source"], files[f]["component"]) - files_id = DBConn().get_files_id(files[f]["pool name"] + f, files[f]["size"], files[f]["md5sum"], files[f]["location id"]) - if files_id == -1: - reject("INTERNAL ERROR, get_files_id() returned multiple matches for %s." % (f)) - elif files_id == -2: - reject("md5sum and/or size mismatch on existing copy of %s." % (f)) - files[f]["files id"] = files_id - - # Check for packages that have moved from one component to another - files[f]['suite'] = suite - ql = get_binary_components(files[f]['package'], suite, files[f][architecture]) - if ql.rowcount > 0: - files[f]["othercomponents"] = ql.fetchone()[0] - - # If the .changes file says it has source, it must have source. - if changes["architecture"].has_key("source"): - if not has_source: - reject("no source found and Architecture line in changes mention source.") - - if not has_binaries and Cnf.FindB("Dinstall::Reject::NoSourceOnly"): - reject("source only uploads are not supported.") - -############################################################################### - -def check_dsc(): - global reprocess - - # Ensure there is source to check - if not changes["architecture"].has_key("source"): - return 1 - - # Find the .dsc - dsc_filename = None - for f in files.keys(): - if files[f]["type"] == "dsc": - if dsc_filename: - reject("can not process a .changes file with multiple .dsc's.") - return 0 - else: - dsc_filename = f - - # If there isn't one, we have nothing to do. (We have reject()ed the upload already) - if not dsc_filename: - reject("source uploads must contain a dsc file") - return 0 - - # Parse the .dsc file - try: - dsc.update(utils.parse_changes(dsc_filename, signing_rules=1)) - except CantOpenError: - # if not -n copy_to_holding() will have done this for us... - if Options["No-Action"]: - reject("%s: can't read file." % (dsc_filename)) - except ParseChangesError, line: - reject("%s: parse error, can't grok: %s." % (dsc_filename, line)) - except InvalidDscError, line: - reject("%s: syntax error on line %s." % (dsc_filename, line)) - except ChangesUnicodeError: - reject("%s: dsc file not proper utf-8." % (dsc_filename)) - - # Build up the file list of files mentioned by the .dsc - try: - dsc_files.update(utils.build_file_list(dsc, is_a_dsc=1)) - except NoFilesFieldError: - reject("%s: no Files: field." % (dsc_filename)) - return 0 - except UnknownFormatError, format: - reject("%s: unknown format '%s'." % (dsc_filename, format)) - return 0 - except ParseChangesError, line: - reject("%s: parse error, can't grok: %s." % (dsc_filename, line)) - return 0 - - # Enforce mandatory fields - for i in ("format", "source", "version", "binary", "maintainer", "architecture", "files"): - if not dsc.has_key(i): - reject("%s: missing mandatory field `%s'." % (dsc_filename, i)) - return 0 - - # Validate the source and version fields - if not re_valid_pkg_name.match(dsc["source"]): - reject("%s: invalid source name '%s'." % (dsc_filename, dsc["source"])) - if not re_valid_version.match(dsc["version"]): - reject("%s: invalid version number '%s'." % (dsc_filename, dsc["version"])) - - # Bumping the version number of the .dsc breaks extraction by stable's - # dpkg-source. So let's not do that... - if dsc["format"] != "1.0": - reject("%s: incompatible 'Format' version produced by a broken version of dpkg-dev 1.9.1{3,4}." % (dsc_filename)) - - # Validate the Maintainer field - try: - fix_maintainer (dsc["maintainer"]) - except ParseMaintError, msg: - reject("%s: Maintainer field ('%s') failed to parse: %s" \ - % (dsc_filename, dsc["maintainer"], msg)) - - # Validate the build-depends field(s) - for field_name in [ "build-depends", "build-depends-indep" ]: - field = dsc.get(field_name) - if field: - # Check for broken dpkg-dev lossage... - if field.startswith("ARRAY"): - reject("%s: invalid %s field produced by a broken version of dpkg-dev (1.10.11)" % (dsc_filename, field_name.title())) - - # Have apt try to parse them... - try: - apt_pkg.ParseSrcDepends(field) - except: - reject("%s: invalid %s field (can not be parsed by apt)." % (dsc_filename, field_name.title())) - pass - - # Ensure the version number in the .dsc matches the version number in the .changes - epochless_dsc_version = re_no_epoch.sub('', dsc["version"]) - changes_version = files[dsc_filename]["version"] - if epochless_dsc_version != files[dsc_filename]["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 = re_issource.match(f) - if not m: - reject("%s: %s in Files field not recognised as source." % (dsc_filename, f)) - continue - ftype = m.group(3) - if ftype == "orig.tar.gz" or ftype == "tar.gz": - has_tar = 1 - if not has_tar: - reject("%s: no .tar.gz or .orig.tar.gz in 'Files' field." % (dsc_filename)) - - # Ensure source is newer than existing source in target suites - reject(Upload.check_source_against_db(dsc_filename),"") - - (reject_msg, is_in_incoming) = Upload.check_dsc_against_db(dsc_filename) - reject(reject_msg, "") - if is_in_incoming: - if not Options["No-Action"]: - copy_to_holding(is_in_incoming) - orig_tar_gz = os.path.basename(is_in_incoming) - files[orig_tar_gz] = {} - files[orig_tar_gz]["size"] = os.stat(orig_tar_gz)[stat.ST_SIZE] - files[orig_tar_gz]["md5sum"] = dsc_files[orig_tar_gz]["md5sum"] - files[orig_tar_gz]["sha1sum"] = dsc_files[orig_tar_gz]["sha1sum"] - files[orig_tar_gz]["sha256sum"] = dsc_files[orig_tar_gz]["sha256sum"] - files[orig_tar_gz]["section"] = files[dsc_filename]["section"] - files[orig_tar_gz]["priority"] = files[dsc_filename]["priority"] - files[orig_tar_gz]["component"] = files[dsc_filename]["component"] - files[orig_tar_gz]["type"] = "orig.tar.gz" - reprocess = 2 - - return 1 - -################################################################################ - -def get_changelog_versions(source_dir): - """Extracts a the source package and (optionally) grabs the - version history out of debian/changelog for the BTS.""" - - # Find the .dsc (again) - dsc_filename = None - for f in files.keys(): - if files[f]["type"] == "dsc": - dsc_filename = f - - # If there isn't one, we have nothing to do. (We have reject()ed the upload already) - if not dsc_filename: - return - - # Create a symlink mirror of the source files in our temporary directory - for f in files.keys(): - m = re_issource.match(f) - if m: - src = os.path.join(source_dir, f) - # If a file is missing for whatever reason, give up. - if not os.path.exists(src): - return - ftype = m.group(3) - if ftype == "orig.tar.gz" and pkg.orig_tar_gz: - continue - dest = os.path.join(os.getcwd(), f) - os.symlink(src, dest) - - # If the orig.tar.gz is not a part of the upload, create a symlink to the - # existing copy. - if pkg.orig_tar_gz: - dest = os.path.join(os.getcwd(), os.path.basename(pkg.orig_tar_gz)) - os.symlink(pkg.orig_tar_gz, dest) - - # Extract the source - cmd = "dpkg-source -sn -x %s" % (dsc_filename) - (result, output) = commands.getstatusoutput(cmd) - if (result != 0): - reject("'dpkg-source -x' failed for %s [return code: %s]." % (dsc_filename, result)) - reject(utils.prefix_multi_line_string(output, " [dpkg-source output:] "), "") - return - - if not Cnf.Find("Dir::Queue::BTSVersionTrack"): - return - - # Get the upstream version - upstr_version = re_no_epoch.sub('', dsc["version"]) - if re_strip_revision.search(upstr_version): - upstr_version = re_strip_revision.sub('', upstr_version) - - # Ensure the changelog file exists - changelog_filename = "%s-%s/debian/changelog" % (dsc["source"], upstr_version) - if not os.path.exists(changelog_filename): - reject("%s: debian/changelog not found in extracted source." % (dsc_filename)) - return - - # Parse the changelog - dsc["bts changelog"] = "" - changelog_file = utils.open_file(changelog_filename) - for line in changelog_file.readlines(): - m = re_changelog_versions.match(line) - if m: - dsc["bts changelog"] += line - changelog_file.close() - - # Check we found at least one revision in the changelog - if not dsc["bts changelog"]: - reject("%s: changelog format not recognised (empty version tree)." % (dsc_filename)) - -######################################## - -def check_source(): - # Bail out if: - # a) there's no source - # or b) reprocess is 2 - we will do this check next time when orig.tar.gz is in 'files' - # or c) the orig.tar.gz is MIA - if not changes["architecture"].has_key("source") or reprocess == 2 \ - or pkg.orig_tar_gz == -1: - return - - tmpdir = utils.temp_dirname() - - # Move into the temporary directory - cwd = os.getcwd() - os.chdir(tmpdir) - - # Get the changelog version history - get_changelog_versions(cwd) - - # Move back and cleanup the temporary tree - os.chdir(cwd) - try: - shutil.rmtree(tmpdir) - except OSError, e: - if errno.errorcode[e.errno] != 'EACCES': - utils.fubar("%s: couldn't remove tmp dir for source tree." % (dsc["source"])) - - reject("%s: source tree could not be cleanly removed." % (dsc["source"])) - # We probably have u-r or u-w directories so chmod everything - # and try again. - cmd = "chmod -R u+rwx %s" % (tmpdir) - result = os.system(cmd) - if result != 0: - utils.fubar("'%s' failed with result %s." % (cmd, result)) - shutil.rmtree(tmpdir) - except: - utils.fubar("%s: couldn't remove tmp dir for source tree." % (dsc["source"])) - -################################################################################ - -# FIXME: should be a debian specific check called from a hook - -def check_urgency (): - if changes["architecture"].has_key("source"): - if not changes.has_key("urgency"): - changes["urgency"] = Cnf["Urgency::Default"] - changes["urgency"] = changes["urgency"].lower() - 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"] - -################################################################################ - -def check_hashes (): - utils.check_hash(".changes", files, "md5", apt_pkg.md5sum) - utils.check_size(".changes", files) - utils.check_hash(".dsc", dsc_files, "md5", apt_pkg.md5sum) - utils.check_size(".dsc", dsc_files) - - # This is stupid API, but it'll have to do for now until - # we actually have proper abstraction - for m in utils.ensure_hashes(changes, dsc, files, dsc_files): - reject(m) - -################################################################################ - -# Sanity check the time stamps of files inside debs. -# [Files in the near future cause ugly warnings and extreme time -# travel can cause errors on extraction] - -def check_timestamps(): - class Tar: - def __init__(self, future_cutoff, past_cutoff): - self.reset() - self.future_cutoff = future_cutoff - self.past_cutoff = past_cutoff - - def reset(self): - self.future_files = {} - self.ancient_files = {} - - def callback(self, Kind,Name,Link,Mode,UID,GID,Size,MTime,Major,Minor): - if MTime > self.future_cutoff: - self.future_files[Name] = MTime - if MTime < self.past_cutoff: - self.ancient_files[Name] = MTime - #### - - future_cutoff = time.time() + int(Cnf["Dinstall::FutureTimeTravelGrace"]) - past_cutoff = time.mktime(time.strptime(Cnf["Dinstall::PastCutoffYear"],"%Y")) - tar = Tar(future_cutoff, past_cutoff) - for filename in files.keys(): - if files[filename]["type"] == "deb": - tar.reset() - try: - deb_file = utils.open_file(filename) - apt_inst.debExtract(deb_file,tar.callback,"control.tar.gz") - deb_file.seek(0) - try: - apt_inst.debExtract(deb_file,tar.callback,"data.tar.gz") - except SystemError, e: - # If we can't find a data.tar.gz, look for data.tar.bz2 instead. - if not re.search(r"Cannot f[ui]nd chunk data.tar.gz$", str(e)): - raise - deb_file.seek(0) - apt_inst.debExtract(deb_file,tar.callback,"data.tar.bz2") - deb_file.close() - # - future_files = tar.future_files.keys() - if future_files: - num_future_files = len(future_files) - future_file = future_files[0] - future_date = tar.future_files[future_file] - reject("%s: has %s file(s) with a time stamp too far into the future (e.g. %s [%s])." - % (filename, num_future_files, future_file, - time.ctime(future_date))) - # - ancient_files = tar.ancient_files.keys() - if ancient_files: - num_ancient_files = len(ancient_files) - ancient_file = ancient_files[0] - ancient_date = tar.ancient_files[ancient_file] - reject("%s: has %s file(s) with a time stamp too ancient (e.g. %s [%s])." - % (filename, num_ancient_files, ancient_file, - time.ctime(ancient_date))) - except: - reject("%s: deb contents timestamp check failed [%s: %s]" % (filename, sys.exc_type, sys.exc_value)) - -################################################################################ - -def lookup_uid_from_fingerprint(fpr): - uid = None - uid_name = "" - # This is a stupid default, but see the comments below - is_dm = False - - user = get_uid_from_fingerprint(changes["fingerprint"]) - - if user is not None: - uid = user.uid - if user.name is None: - uid_name = '' - else: - uid_name = user.name - - # Check the relevant fingerprint (which we have to have) - for f in uid.fingerprint: - if f.fingerprint == changes['fingerprint']: - is_dm = f.keyring.debian_maintainer - break - - return (uid, uid_name, is_dm) - -def check_signed_by_key(): - """Ensure the .changes is signed by an authorized uploader.""" - session = DBConn().session() - - (uid, uid_name, is_dm) = lookup_uid_from_fingerprint(changes["fingerprint"], session=session) - - # match claimed name with actual name: - if uid is None: - # This is fundamentally broken but need us to refactor how we get - # the UIDs/Fingerprints in order for us to fix it properly - uid, uid_email = changes["fingerprint"], uid - may_nmu, may_sponsor = 1, 1 - # XXX by default new dds don't have a fingerprint/uid in the db atm, - # and can't get one in there if we don't allow nmu/sponsorship - elif is_dm is False: - # If is_dm is False, we allow full upload rights - uid_email = "%s@debian.org" % (uid) - may_nmu, may_sponsor = 1, 1 - else: - # Assume limited upload rights unless we've discovered otherwise - uid_email = uid - may_nmu, may_sponsor = 0, 0 - - - if uid_email in [changes["maintaineremail"], changes["changedbyemail"]]: - sponsored = 0 - elif uid_name in [changes["maintainername"], changes["changedbyname"]]: - sponsored = 0 - if uid_name == "": sponsored = 1 - else: - sponsored = 1 - if ("source" in changes["architecture"] and - uid_email and utils.is_email_alias(uid_email)): - sponsor_addresses = utils.gpg_get_key_addresses(changes["fingerprint"]) - if (changes["maintaineremail"] not in sponsor_addresses and - changes["changedbyemail"] not in sponsor_addresses): - changes["sponsoremail"] = uid_email - - if sponsored and not may_sponsor: - reject("%s is not authorised to sponsor uploads" % (uid)) - - if not sponsored and not may_nmu: - should_reject = True - highest_sid, highest_version = None, None - - # XXX: This reimplements in SQLA what existed before but it's fundamentally fucked - # It ignores higher versions with the dm_upload_allowed flag set to false - # I'm keeping the existing behaviour for now until I've gone back and - # checked exactly what the GR says - mhy - for si in get_sources_from_name(source=changes['source'], dm_upload_allowed=True, session=session): - if highest_version is None or apt_pkg.VersionCompare(si.version, highest_version) == 1: - highest_sid = si.source_id - highest_version = si.version - - if highest_sid is None: - reject("Source package %s does not have 'DM-Upload-Allowed: yes' in its most recent version" % changes["source"]) - else: - for sup in s.query(SrcUploader).join(DBSource).filter_by(source_id=highest_sid): - (rfc822, rfc2047, name, email) = sup.maintainer.get_split_maintainer() - if email == uid_email or name == uid_name: - should_reject = False - break - - if should_reject is True: - reject("%s is not in Maintainer or Uploaders of source package %s" % (uid, changes["source"])) - - for b in changes["binary"].keys(): - for suite in changes["distribution"].keys(): - q = session.query(DBSource) - q = q.join(DBBinary).filter_by(package=b) - q = q.join(BinAssociation).join(Suite).filter_by(suite) - - for s in q.all(): - if s.source != changes["source"]: - reject("%s may not hijack %s from source package %s in suite %s" % (uid, b, s, suite)) - - for f in files.keys(): - if files[f].has_key("byhand"): - reject("%s may not upload BYHAND file %s" % (uid, f)) - if files[f].has_key("new"): - reject("%s may not upload NEW file %s" % (uid, f)) - - -################################################################################ -################################################################################ - -# If any file of an upload has a recent mtime then chances are good -# 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 f in file_list: - try: - last_modified = time.time()-os.path.getmtime(f) - if last_modified < int(Cnf["Dinstall::SkipTime"]): - too_new = 1 - break - except: - pass - os.chdir(cwd) - return too_new - -################################################################################ +def action(u): + cnf = Config() -def action (): # changes["distribution"] may not exist in corner cases # (e.g. unreadable changes files) - if not changes.has_key("distribution") or not isinstance(changes["distribution"], DictType): - changes["distribution"] = {} + if not u.pkg.changes.has_key("distribution") or not isinstance(u.pkg.changes["distribution"], DictType): + u.pkg.changes["distribution"] = {} - (summary, short_summary) = Upload.build_summaries() + (summary, short_summary) = u.build_summaries() # q-unapproved hax0ring queue_info = { @@ -1149,13 +129,14 @@ def action (): "Autobyhand" : { "is" : is_autobyhand, "process": do_autobyhand }, "Byhand" : { "is": is_byhand, "process": do_byhand }, "OldStableUpdate" : { "is": is_oldstableupdate, - "process": do_oldstableupdate }, + "process": do_oldstableupdate }, "StableUpdate" : { "is": is_stableupdate, "process": do_stableupdate }, "Unembargo" : { "is": is_unembargo, "process": queue_unembargo }, "Embargo" : { "is": is_embargo, "process": queue_embargo }, } + queues = [ "New", "Autobyhand", "Byhand" ] - if Cnf.FindB("Dinstall::SecurityQueueHandling"): + if cnf.FindB("Dinstall::SecurityQueueHandling"): queues += [ "Unembargo", "Embargo" ] else: queues += [ "OldStableUpdate", "StableUpdate" ] @@ -1166,25 +147,25 @@ def action (): queuekey = '' - if reject_message.find("Rejected") != -1: - if upload_too_new(): - print "SKIP (too new)\n" + reject_message, + pi = u.package_info() + + if len(u.rejects) > 0: + if u.upload_too_new(): + print "SKIP (too new)\n" + pi, prompt = "[S]kip, Quit ?" else: - print "REJECT\n" + reject_message, + print "REJECT\n" + pi prompt = "[R]eject, Skip, Quit ?" if Options["Automatic"]: answer = 'R' else: qu = None for q in queues: - if queue_info[q]["is"](): + if queue_info[q]["is"](u): qu = q break if qu: - print "%s for %s\n%s%s" % ( - qu.upper(), ", ".join(changes["distribution"].keys()), - reject_message, summary), + print "%s for %s\n%s%s" % ( qu.upper(), ", ".join(u.pkg.changes["distribution"].keys()), pi, summary) queuekey = qu[0].upper() if queuekey in "RQSA": queuekey = "D" @@ -1194,7 +175,7 @@ def action (): if Options["Automatic"]: answer = queuekey else: - print "ACCEPT\n" + reject_message + summary, + print "ACCEPT\n" + pi + summary, prompt = "[A]ccept, Skip, Quit ?" if Options["Automatic"]: answer = 'A' @@ -1207,173 +188,138 @@ def action (): answer = answer[:1].upper() if answer == 'R': - os.chdir (pkg.directory) - Upload.do_reject(0, reject_message) + os.chdir(u.pkg.directory) + u.do_reject(0, pi) elif answer == 'A': - accept(summary, short_summary) - remove_from_unchecked() + u.accept(summary, short_summary) + u.check_override() + u.remove() elif answer == queuekey: - queue_info[qu]["process"](summary, short_summary) - remove_from_unchecked() + queue_info[qu]["process"](u, summary, short_summary) + u.remove() elif answer == 'Q': sys.exit(0) -def remove_from_unchecked(): - os.chdir (pkg.directory) - for f in files.keys(): - os.unlink(f) - os.unlink(pkg.changes_file) - ################################################################################ -def accept (summary, short_summary): - Upload.accept(summary, short_summary) - Upload.check_override() - -################################################################################ +def package_to_suite(u, suite): + if not u.pkg.changes["distribution"].has_key(suite): + return False -def move_to_dir (dest, perms=0660, changesperms=0664): - utils.move (pkg.changes_file, dest, perms=changesperms) - file_keys = files.keys() - for f in file_keys: - utils.move (f, dest, perms=perms) - -################################################################################ - -def is_unembargo (): - session = DBConn().session() - q = session.execute("SELECT package FROM disembargo WHERE package = :source AND version = :version", changes) - if q.rowcount > 0: - return 1 + ret = True - oldcwd = os.getcwd() - os.chdir(Cnf["Dir::Queue::Disembargo"]) - disdir = os.getcwd() - os.chdir(oldcwd) + if not u.pkg.changes["architecture"].has_key("source"): + s = DBConn().session() + q = s.query(SrcAssociation.sa_id) + q = q.join(Suite).filter_by(suite_name=suite) + q = q.join(DBSource).filter_by(source=u.pkg.changes['source']) + q = q.filter_by(version=u.pkg.changes['version']).limit(1) - if pkg.directory == disdir: - if changes["architecture"].has_key("source"): - if Options["No-Action"]: - return 1 + # NB: Careful, this logic isn't what you would think it is + # Source is already in {old-,}proposed-updates so no need to hold + # Instead, we don't move to the holding area, we just do an ACCEPT + if q.count() > 0: + ret = False - session.execute("INSERT INTO disembargo (package, version) VALUES (:package, :version)", changes) - session.commit() + s.close() - return 1 + return ret - return 0 +def package_to_queue(u, summary, short_summary, queue, perms=0660, build=True, announce=None): + cnf = Config() + dir = cnf["Dir::Queue::%s" % queue] -def queue_unembargo (summary, short_summary): - print "Moving to UNEMBARGOED holding area." - Logger.log(["Moving to unembargoed", pkg.changes_file]) + print "Moving to %s holding area" % queue.upper() + Logger.log(["Moving to %s" % queue, u.pkg.changes_file]) - Upload.dump_vars(Cnf["Dir::Queue::Unembargoed"]) - move_to_dir(Cnf["Dir::Queue::Unembargoed"]) - Upload.queue_build("unembargoed", Cnf["Dir::Queue::Unembargoed"]) + u.pkg.write_dot_dak(dir) + u.move_to_dir(dir, perms=perms) + if build: + get_or_set_queue(queue.lower()).autobuild_upload(u.pkg, dir) # Check for override disparities - Upload.Subst["__SUMMARY__"] = summary - Upload.check_override() - - # Send accept mail, announce to lists, close bugs and check for - # override disparities - if not Cnf["Dinstall::Options::No-Mail"]: - Upload.Subst["__SUITE__"] = "" - mail_message = utils.TemplateSubst(Upload.Subst,Cnf["Dir::Templates"]+"/process-unchecked.accepted") + u.check_override() + + # Send accept mail, announce to lists and close bugs + if announce and not cnf["Dinstall::Options::No-Mail"]: + template = os.path.join(cnf["Dir::Templates"], announce) + u.update_subst() + u.Subst["__SUITE__"] = "" + mail_message = utils.TemplateSubst(u.Subst, template) utils.send_mail(mail_message) - Upload.announce(short_summary, 1) + u.announce(short_summary, True) ################################################################################ -def is_embargo (): - # if embargoed queues are enabled always embargo - return 1 +def is_unembargo(u): + session = DBConn().session() + cnf = Config() -def queue_embargo (summary, short_summary): - print "Moving to EMBARGOED holding area." - Logger.log(["Moving to embargoed", pkg.changes_file]) + q = session.execute("SELECT package FROM disembargo WHERE package = :source AND version = :version", u.pkg.changes) + if q.rowcount > 0: + session.close() + return True - Upload.dump_vars(Cnf["Dir::Queue::Embargoed"]) - move_to_dir(Cnf["Dir::Queue::Embargoed"]) - Upload.queue_build("embargoed", Cnf["Dir::Queue::Embargoed"]) + oldcwd = os.getcwd() + os.chdir(cnf["Dir::Queue::Disembargo"]) + disdir = os.getcwd() + os.chdir(oldcwd) - # Check for override disparities - Upload.Subst["__SUMMARY__"] = summary - Upload.check_override() - - # Send accept mail, announce to lists, close bugs and check for - # override disparities - if not Cnf["Dinstall::Options::No-Mail"]: - Upload.Subst["__SUITE__"] = "" - mail_message = utils.TemplateSubst(Upload.Subst,Cnf["Dir::Templates"]+"/process-unchecked.accepted") - utils.send_mail(mail_message) - Upload.announce(short_summary, 1) + ret = False -################################################################################ + if u.pkg.directory == disdir: + if u.pkg.changes["architecture"].has_key("source"): + if not Options["No-Action"]: + session.execute("INSERT INTO disembargo (package, version) VALUES (:package, :version)", u.pkg.changes) + session.commit() -def is_stableupdate (): - if not changes["distribution"].has_key("proposed-updates"): - return 0 + ret = True - if not changes["architecture"].has_key("source"): - s = DBConn().session() - q = s.query(SrcAssociation.sa_id) - q = q.join(Suite).filter_by(suite_name='proposed-updates') - q = q.join(DBSource).filter_by(source=changes['source']) - q = q.filter_by(version=changes['version']).limit(1) + session.close() - if q.count() < 1: - return 0 + return ret - return 1 +def queue_unembargo(u, summary, short_summary): + return package_to_queue(u, summary, short_summary, "Unembargoed", + perms=0660, build=True, announce='process-unchecked.accepted') -def do_stableupdate (summary, short_summary): - print "Moving to PROPOSED-UPDATES holding area." - Logger.log(["Moving to proposed-updates", pkg.changes_file]) +################################################################################ - Upload.dump_vars(Cnf["Dir::Queue::ProposedUpdates"]) - move_to_dir(Cnf["Dir::Queue::ProposedUpdates"], perms=0664) +def is_embargo(u): + # if embargoed queues are enabled always embargo + return True - # Check for override disparities - Upload.Subst["__SUMMARY__"] = summary - Upload.check_override() +def queue_embargo(u, summary, short_summary): + return package_to_queue(u, summary, short_summary, "Unembargoed", + perms=0660, build=True, announce='process-unchecked.accepted') ################################################################################ -def is_oldstableupdate (): - if not changes["distribution"].has_key("oldstable-proposed-updates"): - return 0 - - if not changes["architecture"].has_key("source"): - s = DBConn().session() - q = s.query(SrcAssociation.sa_id) - q = q.join(Suite).filter_by(suite_name='oldstable-proposed-updates') - q = q.join(DBSource).filter_by(source=changes['source']) - q = q.filter_by(version=changes['version']).limit(1) - - if q.count() < 1: - return 0 +def is_stableupdate(u): + return package_to_suite(u, 'proposed-updates') - return 1 +def do_stableupdate(u, summary, short_summary): + return package_to_queue(u, summary, short_summary, "ProposedUpdates", + perms=0664, build=False, announce=None) -def do_oldstableupdate (summary, short_summary): - print "Moving to OLDSTABLE-PROPOSED-UPDATES holding area." - Logger.log(["Moving to oldstable-proposed-updates", pkg.changes_file]) +################################################################################ - Upload.dump_vars(Cnf["Dir::Queue::OldProposedUpdates"]) - move_to_dir(Cnf["Dir::Queue::OldProposedUpdates"], perms=0664) +def is_oldstableupdate(u): + return package_to_suite(u, 'oldstable-proposed-updates') - # Check for override disparities - Upload.Subst["__SUMMARY__"] = summary - Upload.check_override() +def do_oldstableupdate(u, summary, short_summary): + return package_to_queue(u, summary, short_summary, "OldProposedUpdates", + perms=0664, build=False, announce=None) ################################################################################ -def is_autobyhand (): +def is_autobyhand(u): + cnf = Config() + all_auto = 1 any_auto = 0 - for f in files.keys(): - if files[f].has_key("byhand"): + for f in u.pkg.files.keys(): + if u.pkg.files[f].has_key("byhand"): any_auto = 1 # filename is of form "PKG_VER_ARCH.EXT" where PKG, VER and ARCH @@ -1385,95 +331,99 @@ def is_autobyhand (): continue (pckg, ver, archext) = f.split("_", 2) - if archext.count(".") < 1 or changes["version"] != ver: + if archext.count(".") < 1 or u.pkg.changes["version"] != ver: all_auto = 0 continue - ABH = Cnf.SubTree("AutomaticByHandPackages") + ABH = cnf.SubTree("AutomaticByHandPackages") if not ABH.has_key(pckg) or \ - ABH["%s::Source" % (pckg)] != changes["source"]: - print "not match %s %s" % (pckg, changes["source"]) + ABH["%s::Source" % (pckg)] != u.pkg.changes["source"]: + print "not match %s %s" % (pckg, u.pkg.changes["source"]) all_auto = 0 continue (arch, ext) = archext.split(".", 1) - if arch not in changes["architecture"]: + if arch not in u.pkg.changes["architecture"]: all_auto = 0 continue - files[f]["byhand-arch"] = arch - files[f]["byhand-script"] = ABH["%s::Script" % (pckg)] + u.pkg.files[f]["byhand-arch"] = arch + u.pkg.files[f]["byhand-script"] = ABH["%s::Script" % (pckg)] return any_auto and all_auto -def do_autobyhand (summary, short_summary): +def do_autobyhand(u, summary, short_summary): print "Attempting AUTOBYHAND." - byhandleft = 0 - for f in files.keys(): + byhandleft = True + for f, entry in u.pkg.files.items(): byhandfile = f - if not files[f].has_key("byhand"): + + if not entry.has_key("byhand"): continue - if not files[f].has_key("byhand-script"): - byhandleft = 1 + + if not entry.has_key("byhand-script"): + byhandleft = True continue os.system("ls -l %s" % byhandfile) + result = os.system("%s %s %s %s %s" % ( - files[f]["byhand-script"], byhandfile, - changes["version"], files[f]["byhand-arch"], - os.path.abspath(pkg.changes_file))) + entry["byhand-script"], + byhandfile, + u.pkg.changes["version"], + entry["byhand-arch"], + os.path.abspath(u.pkg.changes_file))) + if result == 0: os.unlink(byhandfile) - del files[f] + del entry else: print "Error processing %s, left as byhand." % (f) - byhandleft = 1 + byhandleft = True if byhandleft: - do_byhand(summary, short_summary) + do_byhand(u, summary, short_summary) else: - accept(summary, short_summary) + u.accept(summary, short_summary) + u.check_override() + # XXX: We seem to be missing a u.remove() here + # This might explain why we get byhand leftovers in unchecked - mhy ################################################################################ -def is_byhand (): - for f in files.keys(): - if files[f].has_key("byhand"): - return 1 - return 0 - -def do_byhand (summary, short_summary): - print "Moving to BYHAND holding area." - Logger.log(["Moving to byhand", pkg.changes_file]) - - Upload.dump_vars(Cnf["Dir::Queue::Byhand"]) - move_to_dir(Cnf["Dir::Queue::Byhand"]) +def is_byhand(u): + for f in u.pkg.files.keys(): + if u.pkg.files[f].has_key("byhand"): + return True + return False - # Check for override disparities - Upload.Subst["__SUMMARY__"] = summary - Upload.check_override() +def do_byhand(u, summary, short_summary): + return package_to_queue(u, summary, short_summary, "Byhand", + perms=0660, build=False, announce=None) ################################################################################ -def is_new (): - for f in files.keys(): - if files[f].has_key("new"): - return 1 - return 0 +def is_new(u): + for f in u.pkg.files.keys(): + if u.pkg.files[f].has_key("new"): + return True + return False -def acknowledge_new (summary, short_summary): - Subst = Upload.Subst +def acknowledge_new(u, summary, short_summary): + cnf = Config() print "Moving to NEW holding area." - Logger.log(["Moving to new", pkg.changes_file]) + Logger.log(["Moving to new", u.pkg.changes_file]) - Upload.dump_vars(Cnf["Dir::Queue::New"]) - move_to_dir(Cnf["Dir::Queue::New"], perms=0640, changesperms=0644) + u.pkg.write_dot_dak(cnf["Dir::Queue::New"]) + u.move_to_dir(cnf["Dir::Queue::New"], perms=0640, changesperms=0644) if not Options["No-Mail"]: print "Sending new ack." - Subst["__SUMMARY__"] = summary - new_ack_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/process-unchecked.new") + template = os.path.join(cnf["Dir::Templates"], 'process-unchecked.new') + u.update_subst() + u.Subst["__SUMMARY__"] = summary + new_ack_message = utils.TemplateSubst(u.Subst, template) utils.send_mail(new_ack_message) ################################################################################ @@ -1487,73 +437,101 @@ def acknowledge_new (summary, short_summary): # we force the .orig.tar.gz into the .changes structure and reprocess # the .changes file. -def process_it (changes_file): - global reprocess, reject_message +def process_it(changes_file): + global Logger + + cnf = Config() + + holding = Holding() + + u = Upload() + u.pkg.changes_file = changes_file + u.pkg.directory = os.getcwd() + u.logger = Logger + origchanges = os.path.join(u.pkg.directory, u.pkg.changes_file) - # Reset some globals - reprocess = 1 - Upload.init_vars() # Some defaults in case we can't fully process the .changes file - changes["maintainer2047"] = Cnf["Dinstall::MyEmailAddress"] - changes["changedby2047"] = Cnf["Dinstall::MyEmailAddress"] - reject_message = "" + u.pkg.changes["maintainer2047"] = cnf["Dinstall::MyEmailAddress"] + u.pkg.changes["changedby2047"] = cnf["Dinstall::MyEmailAddress"] - # Absolutize the filename to avoid the requirement of being in the - # same directory as the .changes file. - pkg.changes_file = os.path.abspath(changes_file) + # debian-{devel-,}-changes@lists.debian.org toggles writes access based on this header + bcc = "X-DAK: dak process-unchecked" + if cnf.has_key("Dinstall::Bcc"): + u.Subst["__BCC__"] = bcc + "\nBcc: %s" % (cnf["Dinstall::Bcc"]) + else: + u.Subst["__BCC__"] = bcc # Remember where we are so we can come back after cd-ing into the - # holding directory. - pkg.directory = os.getcwd() + # holding directory. TODO: Fix this stupid hack + u.prevdir = os.getcwd() + + # TODO: Figure out something better for this (or whether it's even + # necessary - it seems to have been for use when we were + # still doing the is_unchecked check; reprocess = 2) + u.reprocess = 1 try: # 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::Queue::Holding"]) - copy_to_holding(pkg.changes_file) + os.chdir(cnf["Dir::Queue::Holding"]) + + # Absolutize the filename to avoid the requirement of being in the + # same directory as the .changes file. + holding.copy_to_holding(origchanges) + # Relativize the filename so we use the copy in holding # rather than the original... - pkg.changes_file = os.path.basename(pkg.changes_file) - changes["fingerprint"] = utils.check_signature(pkg.changes_file, reject) - if changes["fingerprint"]: - valid_changes_p = check_changes() + changespath = os.path.basename(u.pkg.changes_file) + + (u.pkg.changes["fingerprint"], rejects) = utils.check_signature(changespath) + + if u.pkg.changes["fingerprint"]: + valid_changes_p = u.load_changes(changespath) else: - valid_changes_p = 0 + valid_changes_p = False + u.rejects.extend(rejects) + if valid_changes_p: - while reprocess: - check_distributions() - check_files() - valid_dsc_p = check_dsc() - if valid_dsc_p: - check_source() - check_hashes() - check_urgency() - check_timestamps() - check_signed_by_key() - Upload.update_subst(reject_message) - action() + while u.reprocess: + u.check_distributions() + u.check_files(not Options["No-Action"]) + valid_dsc_p = u.check_dsc(not Options["No-Action"]) + if valid_dsc_p and not Options["No-Action"]: + u.check_source() + u.check_lintian() + u.check_hashes() + u.check_urgency() + u.check_timestamps() + u.check_signed_by_key() + + action(u) + except SystemExit: raise + except: print "ERROR" traceback.print_exc(file=sys.stderr) - pass # Restore previous WD - os.chdir(pkg.directory) + os.chdir(u.prevdir) ############################################################################### def main(): - global Cnf, Options, Logger + global Options, Logger + cnf = Config() changes_files = init() # -n/--dry-run invalidates some other options which would involve things happening if Options["No-Action"]: Options["Automatic"] = "" + # Initialize our Holding singleton + holding = Holding() + # Ensure all the arguments we were given are .changes files for f in changes_files: if not f.endswith(".changes"): @@ -1561,20 +539,18 @@ def main(): changes_files.remove(f) if changes_files == []: - if Cnf["Dinstall::Options::Directory"] == "": + if cnf["Dinstall::Options::Directory"] == "": utils.fubar("Need at least one .changes file as an argument.") else: sys.exit(0) # Check that we aren't going to clash with the daily cron job - - if not Options["No-Action"] and os.path.exists("%s/daily.lock" % (Cnf["Dir::Lock"])) and not Options["No-Lock"]: + if not Options["No-Action"] and os.path.exists("%s/daily.lock" % (cnf["Dir::Lock"])) 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 - if not Options["No-Action"]: - lock_fd = os.open(Cnf["Dinstall::LockFile"], os.O_RDWR | os.O_CREAT) + lock_fd = os.open(cnf["Dinstall::LockFile"], os.O_RDWR | os.O_CREAT) try: fcntl.lockf(lock_fd, fcntl.LOCK_EX | fcntl.LOCK_NB) except IOError, e: @@ -1582,15 +558,7 @@ def main(): utils.fubar("Couldn't obtain lock; assuming another 'dak process-unchecked' is already running.") else: raise - Logger = Upload.Logger = daklog.Logger(Cnf, "process-unchecked") - - # debian-{devel-,}-changes@lists.debian.org toggles writes access based on this header - bcc = "X-DAK: dak process-unchecked\nX-Katie: $Revision: 1.65 $" - if Cnf.has_key("Dinstall::Bcc"): - Upload.Subst["__BCC__"] = bcc + "\nBcc: %s" % (Cnf["Dinstall::Bcc"]) - else: - Upload.Subst["__BCC__"] = bcc - + Logger = daklog.Logger(cnf, "process-unchecked") # Sort the .changes files so that we process sourceful ones first changes_files.sort(utils.changes_compare) @@ -1602,10 +570,11 @@ def main(): process_it (changes_file) finally: if not Options["No-Action"]: - clean_holding() + holding.clean() + + accept_count = SummaryStats().accept_count + accept_bytes = SummaryStats().accept_bytes - accept_count = Upload.accept_count - accept_bytes = Upload.accept_bytes if accept_count: sets = "set" if accept_count > 1: