X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=daklib%2Fqueue.py;h=b11534a0592ac4b7e7f1f8316dbc8a13b7bae9a6;hb=9fa241c825a40bd09bd1c2e6b7f065f4a1dc0481;hp=77f402502ca0b6952ea400ec7d1a9903bc4c1992;hpb=3df860e9be404d016ccdf67e4caa54f61d7236ff;p=dak.git diff --git a/daklib/queue.py b/daklib/queue.py index 77f40250..b11534a0 100755 --- a/daklib/queue.py +++ b/daklib/queue.py @@ -36,6 +36,8 @@ import time import apt_inst import apt_pkg import utils +import commands +import shutil from types import * from dak_exceptions import * @@ -47,23 +49,24 @@ from dbconn import * from summarystats import SummaryStats from utils import parse_changes from textutils import fix_maintainer +from binary import Binary ############################################################################### -def get_type(f, session=None): +def get_type(f, session): """ Get the file type of C{f} @type f: dict @param f: file entry from Changes object + @type session: SQLA Session + @param session: SQL Alchemy session object + @rtype: string @return: filetype """ - if session is None: - session = DBConn().session() - # Determine the type if f.has_key("dbtype"): file_type = file["dbtype"] @@ -112,7 +115,7 @@ def determine_new(changes, files, warn=1): pkg = f["package"] priority = f["priority"] section = f["section"] - file_type = get_type(f) + file_type = get_type(f, session) component = f["component"] if file_type == "dsc": @@ -157,6 +160,8 @@ def determine_new(changes, files, warn=1): if new[pkg].has_key("othercomponents"): print "WARNING: %s already present in %s distribution." % (pkg, new[pkg]["othercomponents"]) + session.close() + return new ################################################################################ @@ -211,7 +216,7 @@ def lookup_uid_from_fingerprint(fpr, session): # This is a stupid default, but see the comments below is_dm = False - user = get_uid_from_fingerprint(changes["fingerprint"], session) + user = get_uid_from_fingerprint(fpr, session) if user is not None: uid = user.uid @@ -221,8 +226,8 @@ def lookup_uid_from_fingerprint(fpr, session): uid_name = user.name # Check the relevant fingerprint (which we have to have) - for f in uid.fingerprint: - if f.fingerprint == changes['fingerprint']: + for f in user.fingerprint: + if f.fingerprint == fpr: is_dm = f.keyring.debian_maintainer break @@ -255,6 +260,7 @@ class Upload(object): """ def __init__(self): + self.logger = None self.pkg = Changes() self.reset() @@ -302,7 +308,7 @@ class Upload(object): # If 'dak process-unchecked' crashed out in the right place, architecture may still be a string. if not self.pkg.changes.has_key("architecture") or not \ - isinstance(changes["architecture"], DictType): + isinstance(self.pkg.changes["architecture"], DictType): self.pkg.changes["architecture"] = { "Unknown" : "" } # and maintainer2047 may not exist. @@ -319,7 +325,7 @@ class Upload(object): (self.pkg.changes["changedby822"] != self.pkg.changes["maintainer822"]): self.Subst["__MAINTAINER_FROM__"] = self.pkg.changes["changedby2047"] - self.Subst["__MAINTAINER_TO__"] = "%s, %s" % (self.pkg.changes["changedby2047"], changes["maintainer2047"]) + self.Subst["__MAINTAINER_TO__"] = "%s, %s" % (self.pkg.changes["changedby2047"], self.pkg.changes["maintainer2047"]) self.Subst["__MAINTAINER__"] = self.pkg.changes.get("changed-by", "Unknown") else: self.Subst["__MAINTAINER_FROM__"] = self.pkg.changes["maintainer2047"] @@ -350,6 +356,7 @@ class Upload(object): This is simply to prevent us even trying things later which will fail because we couldn't properly parse the file. """ + Cnf = Config() self.pkg.changes_file = filename # Parse the .changes field into a dictionary @@ -367,7 +374,7 @@ class Upload(object): # Parse the Files field from the .changes into another dictionary try: - self.pkg.files.update(build_file_list(self.pkg.changes)) + self.pkg.files.update(utils.build_file_list(self.pkg.changes)) except ParseChangesError, line: self.rejects.append("%s: parse error, can't grok: %s." % (filename, line)) return False @@ -479,7 +486,7 @@ class Upload(object): (source, dest) = args[1:3] if self.pkg.changes["distribution"].has_key(source): for arch in self.pkg.changes["architecture"].keys(): - if arch not in [ arch_string for a in get_suite_architectures(source) ]: + if arch not in [ a.arch_string for a in get_suite_architectures(source) ]: self.notes.append("Mapping %s to %s for unreleased architecture %s." % (source, dest, arch)) del self.pkg.changes["distribution"][source] self.pkg.changes["distribution"][dest] = 1 @@ -604,9 +611,9 @@ class Upload(object): entry["maintainer"] = control.Find("Maintainer", "") if f.endswith(".udeb"): - files[f]["dbtype"] = "udeb" + self.pkg.files[f]["dbtype"] = "udeb" elif f.endswith(".deb"): - files[f]["dbtype"] = "deb" + self.pkg.files[f]["dbtype"] = "deb" else: self.rejects.append("%s is neither a .deb or a .udeb." % (f)) @@ -622,7 +629,7 @@ class Upload(object): source_version = m.group(2) if not source_version: - source_version = files[f]["version"] + source_version = self.pkg.files[f]["version"] entry["source package"] = source entry["source version"] = source_version @@ -680,7 +687,8 @@ class Upload(object): # Check the version and for file overwrites self.check_binary_against_db(f, session) - b = Binary(f).scan_package() + b = Binary(f) + b.scan_package() if len(b.rejects) > 0: for j in b.rejects: self.rejects.append(j) @@ -726,11 +734,22 @@ class Upload(object): def per_suite_file_checks(self, f, suite, session): cnf = Config() entry = self.pkg.files[f] + archive = utils.where_am_i() # Skip byhand if entry.has_key("byhand"): return + # Check we have fields we need to do these checks + oktogo = True + for m in ['component', 'package', 'priority', 'size', 'md5sum']: + if not entry.has_key(m): + self.rejects.append("file '%s' does not have field %s set" % (f, m)) + oktogo = False + + if not oktogo: + return + # Handle component mappings for m in cnf.ValueList("ComponentMappings"): (source, dest) = m.split() @@ -745,8 +764,7 @@ class Upload(object): return # Validate the component - component = entry["component"] - if not get_component(component, session): + if not get_component(entry["component"], session): self.rejects.append("file '%s' has unknown component '%s'." % (f, component)) return @@ -760,7 +778,7 @@ class Upload(object): # Determine the location location = cnf["Dir::Pool"] - l = get_location(location, component, archive, session) + l = get_location(location, entry["component"], archive, session) if l is None: self.rejects.append("[INTERNAL ERROR] couldn't determine location (Component: %s, Archive: %s)" % (component, archive)) entry["location id"] = -1 @@ -785,7 +803,7 @@ class Upload(object): # Check for packages that have moved from one component to another entry['suite'] = suite - res = get_binary_components(files[f]['package'], suite, entry["architecture"], session) + res = get_binary_components(self.pkg.files[f]['package'], suite, entry["architecture"], session) if res.rowcount > 0: entry["othercomponents"] = res.fetchone()[0] @@ -834,7 +852,7 @@ class Upload(object): has_binaries = False has_source = False - s = DBConn().session() + session = DBConn().session() for f, entry in self.pkg.files.items(): # Ensure the file does not already exist in one of the accepted directories @@ -888,6 +906,8 @@ class Upload(object): for suite in self.pkg.changes["distribution"].keys(): self.per_suite_file_checks(f, suite, session) + session.close() + # If the .changes file says it has source, it must have source. if self.pkg.changes["architecture"].has_key("source"): if not has_source: @@ -934,7 +954,7 @@ class Upload(object): # Build up the file list of files mentioned by the .dsc try: - self.pkg.dsc_files.update(utils.build_file_list(dsc, is_a_dsc=1)) + self.pkg.dsc_files.update(utils.build_file_list(self.pkg.dsc, is_a_dsc=1)) except NoFilesFieldError: self.rejects.append("%s: no Files: field." % (dsc_filename)) return False @@ -954,7 +974,7 @@ class Upload(object): # Validate the source and version fields if not re_valid_pkg_name.match(self.pkg.dsc["source"]): self.rejects.append("%s: invalid source name '%s'." % (dsc_filename, self.pkg.dsc["source"])) - if not re_valid_version.match(dsc["version"]): + if not re_valid_version.match(self.pkg.dsc["version"]): self.rejects.append("%s: invalid version number '%s'." % (dsc_filename, self.pkg.dsc["version"])) # Bumping the version number of the .dsc breaks extraction by stable's @@ -994,7 +1014,7 @@ class Upload(object): # Ensure there is a .tar.gz in the .dsc file has_tar = False - for f in dsc_files.keys(): + for f in self.pkg.dsc_files.keys(): m = re_issource.match(f) if not m: self.rejects.append("%s: %s in Files field not recognised as source." % (dsc_filename, f)) @@ -1007,9 +1027,10 @@ class Upload(object): self.rejects.append("%s: no .tar.gz or .orig.tar.gz in 'Files' field." % (dsc_filename)) # Ensure source is newer than existing source in target suites + session = DBConn().session() self.check_source_against_db(dsc_filename, session) - - self.check_dsc_against_db(dsc_filename) + self.check_dsc_against_db(dsc_filename, session) + session.close() return True @@ -1023,8 +1044,8 @@ class Upload(object): # Find the .dsc (again) dsc_filename = None - for f in self.files.keys(): - if files[f]["type"] == "dsc": + for f in self.pkg.files.keys(): + if self.pkg.files[f]["type"] == "dsc": dsc_filename = f # If there isn't one, we have nothing to do. (We have reject()ed the upload already) @@ -1032,7 +1053,7 @@ class Upload(object): return # Create a symlink mirror of the source files in our temporary directory - for f in self.files.keys(): + for f in self.pkg.files.keys(): m = re_issource.match(f) if m: src = os.path.join(source_dir, f) @@ -1063,7 +1084,7 @@ class Upload(object): return # Get the upstream version - upstr_version = re_no_epoch.sub('', dsc["version"]) + upstr_version = re_no_epoch.sub('', self.pkg.dsc["version"]) if re_strip_revision.search(upstr_version): upstr_version = re_strip_revision.sub('', upstr_version) @@ -1114,6 +1135,7 @@ class Upload(object): shutil.rmtree(tmpdir) except OSError, e: if e.errno != errno.EACCES: + print "foobar" utils.fubar("%s: couldn't remove tmp dir for source tree." % (self.pkg.dsc["source"])) self.rejects.append("%s: source tree could not be cleanly removed." % (self.pkg.dsc["source"])) @@ -1124,7 +1146,8 @@ class Upload(object): if result != 0: utils.fubar("'%s' failed with result %s." % (cmd, result)) shutil.rmtree(tmpdir) - except: + except Exception, e: + print "foobar2 (%s)" % e utils.fubar("%s: couldn't remove tmp dir for source tree." % (self.pkg.dsc["source"])) ########################################################################### @@ -1138,7 +1161,7 @@ class Upload(object): # We need to deal with the original changes blob, as the fields we need # might not be in the changes dict serialised into the .dak anymore. - orig_changes = parse_deb822(self.pkg.changes['filecontents']) + orig_changes = utils.parse_deb822(self.pkg.changes['filecontents']) # Copy the checksums over to the current changes dict. This will keep # the existing modifications to it intact. @@ -1164,7 +1187,7 @@ class Upload(object): for j in utils._ensure_dsc_hash(self.pkg.dsc, self.pkg.dsc_files, hashname, hashfunc): self.rejects.append(j) - def check_hashes(): + def check_hashes(self): for m in utils.check_hash(".changes", self.pkg.files, "md5", apt_pkg.md5sum): self.rejects.append(m) @@ -1177,8 +1200,7 @@ class Upload(object): for m in utils.check_size(".dsc", self.pkg.dsc_files): self.rejects.append(m) - for m in utils.ensure_hashes(self.pkg.changes, dsc, files, dsc_files): - self.rejects.append(m) + self.ensure_hashes() ########################################################################### def check_urgency(self): @@ -1199,11 +1221,13 @@ class Upload(object): # travel can cause errors on extraction] def check_timestamps(self): + Cnf = Config() + future_cutoff = time.time() + int(Cnf["Dinstall::FutureTimeTravelGrace"]) past_cutoff = time.mktime(time.strptime(Cnf["Dinstall::PastCutoffYear"],"%Y")) tar = TarTime(future_cutoff, past_cutoff) - for filename, entry in self.pkg.files.keys(): + for filename, entry in self.pkg.files.items(): if entry["type"] == "deb": tar.reset() try: @@ -1309,7 +1333,7 @@ class Upload(object): for suite in self.pkg.changes["distribution"].keys(): q = session.query(DBSource) q = q.join(DBBinary).filter_by(package=b) - q = q.join(BinAssociation).join(Suite).filter_by(suite) + q = q.join(BinAssociation).join(Suite).filter_by(suite_name=suite) for s in q.all(): if s.source != self.pkg.changes["source"]: @@ -1321,6 +1345,8 @@ class Upload(object): if self.pkg.files[f].has_key("new"): self.rejects.append("%s may not upload NEW file %s" % (uid, f)) + session.close() + ########################################################################### def build_summaries(self): """ Build a summary of changes the upload introduces. """ @@ -1388,8 +1414,8 @@ distribution.""" del self.Subst["__BUG_NUMBER__"] del self.Subst["__STABLE_WARNING__"] - if action: - self.Logger.log(["closing bugs"] + bugs) + if action and self.logger: + self.logger.log(["closing bugs"] + bugs) summary += "\n" @@ -1426,7 +1452,7 @@ distribution.""" self.Subst["__SHORT_SUMMARY__"] = short_summary for dist in self.pkg.changes["distribution"].keys(): - announce_list = Cnf.Find("Suite::%s::Announce" % (dist)) + announce_list = cnf.Find("Suite::%s::Announce" % (dist)) if announce_list == "" or lists_done.has_key(announce_list): continue @@ -1481,9 +1507,10 @@ distribution.""" targetdir = cnf["Dir::Queue::Accepted"] print "Accepting." - self.Logger.log(["Accepting changes", self.pkg.changes_file]) + if self.logger: + self.logger.log(["Accepting changes", self.pkg.changes_file]) - self.write_dot_dak(targetdir) + self.pkg.write_dot_dak(targetdir) # Move all the files into the accepted directory utils.move(self.pkg.changes_file, targetdir) @@ -1754,12 +1781,13 @@ distribution.""" if not cnf["Dinstall::Options::No-Mail"]: utils.send_mail(reject_mail_message) - self.Logger.log(["rejected", pkg.changes_file]) + if self.logger: + self.logger.log(["rejected", self.pkg.changes_file]) return 0 ################################################################################ - def in_override_p(self, package, component, suite, binary_type, file, session=None): + def in_override_p(self, package, component, suite, binary_type, file, session): """ Check if a package already has override entries in the DB @@ -1784,9 +1812,6 @@ distribution.""" cnf = Config() - if session is None: - session = DBConn().session() - if binary_type == "": # must be source file_type = "dsc" else: @@ -1822,8 +1847,9 @@ distribution.""" Description: TODO """ + Cnf = Config() anyversion = None - anysuite = [suite] + self.Cnf.ValueList("Suite::%s::VersionChecks::Enhances" % (suite)) + anysuite = [suite] + Cnf.ValueList("Suite::%s::VersionChecks::Enhances" % (suite)) for (s, v) in sv_list: if s in [ x.lower() for x in anysuite ]: if not anyversion or apt_pkg.VersionCompare(anyversion, v) <= 0: @@ -1911,34 +1937,28 @@ distribution.""" self.reject.append("%s: old version (%s) in %s <= new version (%s) targeted at %s." % (file, existent_version, suite, new_version, target_suite)) ################################################################################ - def check_binary_against_db(self, file, session=None): - if session is None: - session = DBConn().session() - + def check_binary_against_db(self, file, session): # Ensure version is sane q = session.query(BinAssociation) q = q.join(DBBinary).filter(DBBinary.package==self.pkg.files[file]["package"]) q = q.join(Architecture).filter(Architecture.arch_string.in_([self.pkg.files[file]["architecture"], 'all'])) self.cross_suite_version_check([ (x.suite.suite_name, x.binary.version) for x in q.all() ], - file, files[file]["version"], sourceful=False) + file, self.pkg.files[file]["version"], sourceful=False) # Check for any existing copies of the file - q = session.query(DBBinary).filter_by(files[file]["package"]) - q = q.filter_by(version=files[file]["version"]) - q = q.join(Architecture).filter_by(arch_string=files[file]["architecture"]) + q = session.query(DBBinary).filter_by(package=self.pkg.files[file]["package"]) + q = q.filter_by(version=self.pkg.files[file]["version"]) + q = q.join(Architecture).filter_by(arch_string=self.pkg.files[file]["architecture"]) if q.count() > 0: self.rejects.append("%s: can not overwrite existing copy already in the archive." % (file)) ################################################################################ - def check_source_against_db(self, file, session=None): + def check_source_against_db(self, file, session): """ """ - if session is None: - session = DBConn().session() - source = self.pkg.dsc.get("source") version = self.pkg.dsc.get("version") @@ -1950,7 +1970,7 @@ distribution.""" file, version, sourceful=True) ################################################################################ - def check_dsc_against_db(self, file, session=None): + def check_dsc_against_db(self, file, session): """ @warning: NB: this function can remove entries from the 'files' index [if @@ -1961,9 +1981,7 @@ distribution.""" """ - if session is None: - session = DBConn().session() - + Cnf = Config() self.pkg.orig_tar_gz = None # Try and find all files mentioned in the .dsc. This has @@ -1979,7 +1997,7 @@ distribution.""" found = "%s in incoming" % (dsc_name) # Check the file does not already exist in the archive - ql = get_poolfile_like_name(dsc_name) + ql = get_poolfile_like_name(dsc_name, session) # Strip out anything that isn't '%s' or '/%s$' for i in ql: @@ -2007,7 +2025,7 @@ distribution.""" # TODO: Don't delete the entry, just mark it as not needed # This would fix the stupidity of changing something we often iterate over # whilst we're doing it - del files[dsc_name] + del self.pkg.files[dsc_name] self.pkg.orig_tar_gz = os.path.join(i.location.path, i.filename) match = 1 @@ -2048,18 +2066,20 @@ distribution.""" old_file_fh.close() actual_size = os.stat(old_file)[stat.ST_SIZE] found = old_file - suite_type = f.location.archive_type + suite_type = x.location.archive_type # need this for updating dsc_files in install() - dsc_entry["files id"] = f.file_id + dsc_entry["files id"] = x.file_id # See install() in process-accepted... - self.pkg.orig_tar_id = f.file_id + self.pkg.orig_tar_id = x.file_id self.pkg.orig_tar_gz = old_file - self.pkg.orig_tar_location = f.location.location_id + self.pkg.orig_tar_location = x.location.location_id else: # TODO: Record the queues and info in the DB so we don't hardcode all this crap # Not there? Check the queue directories... for directory in [ "Accepted", "New", "Byhand", "ProposedUpdates", "OldProposedUpdates", "Embargoed", "Unembargoed" ]: - in_otherdir = os.path.join(self.Cnf["Dir::Queue::%s" % (directory)], dsc_name) + if not Cnf.has_key("Dir::Queue::%s" % (directory)): + continue + in_otherdir = os.path.join(Cnf["Dir::Queue::%s" % (directory)], dsc_name) if os.path.exists(in_otherdir): in_otherdir_fh = utils.open_file(in_otherdir) actual_md5 = apt_pkg.md5sum(in_otherdir_fh) @@ -2081,18 +2101,21 @@ distribution.""" self.rejects.append("size for %s doesn't match %s." % (found, file)) ################################################################################ - def accepted_checks(self, overwrite_checks=True, session=None): + def accepted_checks(self, overwrite_checks, session): # Recheck anything that relies on the database; since that's not # frozen between accept and our run time when called from p-a. # overwrite_checks is set to False when installing to stable/oldstable - if session is None: - session = DBConn().session() - propogate={} nopropogate={} + # Find the .dsc (again) + dsc_filename = None + for f in self.pkg.files.keys(): + if self.pkg.files[f]["type"] == "dsc": + dsc_filename = f + for checkfile in self.pkg.files.keys(): # The .orig.tar.gz can disappear out from under us is it's a # duplicate of one in the archive. @@ -2119,7 +2142,7 @@ distribution.""" # propogate in the case it is in the override tables: for suite in self.pkg.changes.get("propdistribution", {}).keys(): - if self.in_override_p(entry["package"], entry["component"], suite, entry.get("dbtype",""), checkfile): + if self.in_override_p(entry["package"], entry["component"], suite, entry.get("dbtype",""), checkfile, session): propogate[suite] = 1 else: nopropogate[suite] = 1 @@ -2132,7 +2155,7 @@ distribution.""" for checkfile in self.pkg.files.keys(): # Check the package is still in the override tables for suite in self.pkg.changes["distribution"].keys(): - if not self.in_override_p(entry["package"], entry["component"], suite, entry.get("dbtype",""), checkfile): + if not self.in_override_p(entry["package"], entry["component"], suite, entry.get("dbtype",""), checkfile, session): self.rejects.append("%s is NEW for %s." % (checkfile, suite)) ################################################################################