X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fbinary.py;h=c6ee96f86d5f1eed8b210720697e1620e2448ead;hb=bcb7c250fc94b6568c920e41281d44d05f705556;hp=80805276c4ebcef33d7a45564b944606905cdaa4;hpb=5fe5b6fd6f13fbd6899c716f091aa23b02654335;p=dak.git diff --git a/daklib/binary.py b/daklib/binary.py index 80805276..c6ee96f8 100755 --- a/daklib/binary.py +++ b/daklib/binary.py @@ -42,30 +42,38 @@ Functions related debian binary packages import os import sys import shutil -import tempfile import tarfile import commands import traceback import atexit + from debian_bundle import deb822 -from dbconn import DBConn + +from dbconn import * from config import Config -import logging import utils +################################################################################ + +__all__ = [] + +################################################################################ + class Binary(object): def __init__(self, filename, reject=None): """ - @ptype filename: string + @type filename: string @param filename: path of a .deb - @ptype reject: function + @type reject: function @param reject: a function to log reject messages to """ self.filename = filename self.tmpdir = None self.chunks = None self.wrapped_reject = reject + # Store rejects for later use + self.rejects = [] def reject(self, message): """ @@ -73,6 +81,7 @@ class Binary(object): otherwise send it to stderr. """ print >> sys.stderr, message + self.rejects.append(message) if self.wrapped_reject: self.wrapped_reject(message) @@ -127,7 +136,7 @@ class Binary(object): finally: os.chdir( cwd ) - def valid_deb(self): + def valid_deb(self, relaxed=False): """ Check deb contents making sure the .deb contains: 1. debian-binary @@ -137,9 +146,14 @@ class Binary(object): """ self.__scan_ar() rejected = not self.chunks - if len(self.chunks) != 3: - rejected = True - self.reject("%s: found %d chunks, expected 3." % (self.filename, len(self.chunks))) + if relaxed: + if len(self.chunks) < 3: + rejected = True + self.reject("%s: found %d chunks, expected at least 3." % (self.filename, len(self.chunks))) + else: + if len(self.chunks) != 3: + rejected = True + self.reject("%s: found %d chunks, expected 3." % (self.filename, len(self.chunks))) if self.chunks[0] != "debian-binary": rejected = True self.reject("%s: first chunk is '%s', expected 'debian-binary'." % (self.filename, self.chunks[0])) @@ -152,7 +166,7 @@ class Binary(object): return not rejected - def scan_package(self, bootstrap_id=0): + def scan_package(self, bootstrap_id=0, relaxed=False, session=None): """ Unpack the .deb, do sanity checking, and gather info from it. @@ -160,15 +174,15 @@ class Binary(object): the hopefully near future, it should also include gathering info from the control file. - @ptype bootstrap_id: int + @type bootstrap_id: int @param bootstrap_id: the id of the binary these packages should be associated or zero meaning we are not bootstrapping so insert into a temporary table - @return True if the deb is valid and contents were imported + @return: True if the deb is valid and contents were imported """ result = False - rejected = not self.valid_deb() + rejected = not self.valid_deb(relaxed) if not rejected: self.__unpack() @@ -186,16 +200,17 @@ class Binary(object): data = tarfile.open(os.path.join(self.tmpdir, "data.tar.bz2" ), "r:bz2") if bootstrap_id: - result = DBConn().insert_content_paths(bootstrap_id, [tarinfo.name for tarinfo in data if not tarinfo.isdir()]) + result = insert_content_paths(bootstrap_id, [tarinfo.name for tarinfo in data if not tarinfo.isdir()], session) else: pkgs = deb822.Packages.iter_paragraphs(file(os.path.join(self.tmpdir,'control'))) pkg = pkgs.next() - result = DBConn().insert_pending_content_paths(pkg, [tarinfo.name for tarinfo in data if not tarinfo.isdir()]) + result = insert_pending_content_paths(pkg, [tarinfo.name for tarinfo in data if not tarinfo.isdir()], session) except: traceback.print_exc() os.chdir(cwd) + self._cleanup() return result def check_utf8_package(self, package): @@ -206,14 +221,13 @@ class Binary(object): the hopefully near future, it should also include gathering info from the control file. - @ptype bootstrap_id: int - @param bootstrap_id: the id of the binary these packages - should be associated or zero meaning we are not bootstrapping - so insert into a temporary table + @type package: string + @param package: the name of the package to be checked - @return True if the deb is valid and contents were imported + @rtype: boolean + @return: True if the deb is valid and contents were imported """ - rejected = not self.valid_deb() + rejected = not self.valid_deb(True) self.__unpack() if not rejected and self.tmpdir: @@ -234,12 +248,79 @@ class Binary(object): except: print >> sys.stderr, "E: %s has non-unicode filename: %s" % (package,tarinfo.name) + result = True + except: traceback.print_exc() result = False os.chdir(cwd) -if __name__ == "__main__": - Binary( "/srv/ftp.debian.org/queue/accepted/halevt_0.1.3-2_amd64.deb" ).scan_package() + return result + +__all__.append('Binary') + +def copy_temporary_contents(package, version, archname, deb, reject, session=None): + """ + copy the previously stored contents from the temp table to the permanant one + + during process-unchecked, the deb should have been scanned and the + contents stored in pending_content_associations + """ + + cnf = Config() + + privatetrans = False + if session is None: + session = DBConn().session() + privatetrans = True + + arch = get_architecture(archname, session=session) + + # first see if contents exist: + in_pcaq = """SELECT 1 FROM pending_content_associations + WHERE package=:package + AND version=:version + AND architecture=:archid LIMIT 1""" + + vals = {'package': package, + 'version': version, + 'archid': arch.arch_id} + + exists = None + check = session.execute(in_pcaq, vals) + + if check.rowcount > 0: + # This should NOT happen. We should have added contents + # during process-unchecked. if it did, log an error, and send + # an email. + subst = { + "__PACKAGE__": package, + "__VERSION__": version, + "__ARCH__": arch, + "__TO_ADDRESS__": cnf["Dinstall::MyAdminAddress"], + "__DAK_ADDRESS__": cnf["Dinstall::MyEmailAddress"] } + + message = utils.TemplateSubst(subst, cnf["Dir::Templates"]+"/missing-contents") + utils.send_mail(message) + + # Temporarily disable contents storage until we re-do the table layout + #exists = Binary(deb, reject).scan_package() + + if exists: + sql = """INSERT INTO content_associations(binary_pkg,filepath,filename) + SELECT currval('binaries_id_seq'), filepath, filename FROM pending_content_associations + WHERE package=:package AND version=:version AND architecture=:archid""" + session.execute(sql, vals) + + sql = """DELETE from pending_content_associations + WHERE package=:package AND version=:version AND architecture=:archid""" + session.execute(sql, vals) + session.commit() + + if privatetrans: + session.close() + + return exists +__all__.append('copy_temporary_contents')