X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fbinary.py;h=3a8d15e21e359ed82e5092238d6bef2971cc2bf1;hb=2f2cc6977f137b0581c83aceb881dd667fee47f7;hp=88d78761cadcba3cdce04864d992ef8062f0cc15;hpb=6a4cddfbe864e563e671fe5dabf5600c4783af5c;p=dak.git diff --git a/daklib/binary.py b/daklib/binary.py old mode 100755 new mode 100644 index 88d78761..3a8d15e2 --- 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) @@ -157,7 +166,7 @@ class Binary(object): return not rejected - def scan_package(self, bootstrap_id=0, relaxed=False): + def scan_package(self, bootstrap_id=0, relaxed=False, session=None): """ Unpack the .deb, do sanity checking, and gather info from it. @@ -165,12 +174,12 @@ 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(relaxed) @@ -191,11 +200,14 @@ 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, + self.filename.endswith('.udeb'), + [tarinfo.name for tarinfo in data if not tarinfo.isdir()], + session) except: traceback.print_exc() @@ -212,12 +224,11 @@ 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(True) self.__unpack() @@ -240,10 +251,112 @@ 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) + return result + +__all__.append('Binary') + + +def copy_temporary_contents(binary, bin_association, 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) + + pending = session.query(PendingBinContents).filter_by(package=binary.package, + version=binary.version, + arch=binary.arch).first() + + if pending: + # 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) + + # rescan it now + exists = Binary(deb, reject).scan_package() + + if not exists: + # LOG? + return False + + component = binary.poolfile.location.component + override = session.query(Override).filter_by(package=binary.package, + suite=bin_association.suite, + component=component.id).first() + if not override: + # LOG? + return False + + + if not override.overridetype.type.endswith('deb'): + return True + + if override.overridetype.type == "udeb": + table = "udeb_contents" + elif override.overridetype.type == "deb": + table = "deb_contents" + else: + return False + + + if component.name == "main": + component_str = "" + else: + component_str = component.name + "/" + + vals = { 'package':binary.package, + 'version':binary.version, + 'arch':binary.architecture, + 'binary_id': binary.id, + 'component':component_str, + 'section':override.section.section + } + + session.execute( """INSERT INTO %s + (binary_id,package,version.component,arch,section,filename) + SELECT :binary_id, :package, :version, :component, :arch, :section + FROM pending_bin_contents pbc + WHERE pbc.package=:package + AND pbc.version=:version + AND pbc.arch=:arch""" % table, vals ) + + session.execute( """DELETE from pending_bin_contents package=:package + AND version=:version + AND arch=:arch""", vals ) + + if privatetrans: + session.commit() + session.close() + + return exists + +__all__.append('copy_temporary_contents') +