X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fbinary.py;h=bd7f1cc194a854207a3d858eff4095db0ab5beb5;hb=b612f3da207fa0d75a5d3b204ac8f02bb244231a;hp=042cd266070a300f6e62644f8c709866cf6e7de1;hpb=c2172227d8c1b7f5875c027ad597af1a81c51495;p=dak.git diff --git a/daklib/binary.py b/daklib/binary.py index 042cd266..bd7f1cc1 100755 --- a/daklib/binary.py +++ b/daklib/binary.py @@ -24,7 +24,23 @@ Functions related debian binary packages ################################################################################ +# are we going the xorg way? +# a dak without a dak.conf? +# automatically detect the wrong settings at runtime? +# yes! +# well, we'll probably always need dak.conf (how do you get the database setting +# but removing most of the config into the database seems sane +# mhy: dont spoil the fun +# mhy: and i know how. we nmap localhost and check all open ports +# maybe one answers to sql +# we will discover projectb via avahi +# you're both sick +# really fucking sick + +################################################################################ + import os +import sys import shutil import tempfile import tarfile @@ -33,12 +49,32 @@ import traceback import atexit from debian_bundle import deb822 from dbconn import DBConn +from config import Config +import logging +import utils class Binary(object): - def __init__(self, filename): + def __init__(self, filename, reject=None): + """ + @type filename: string + @param filename: path of a .deb + + @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 + + def reject(self, message): + """ + if we were given a reject function, send the reject message, + otherwise send it to stderr. + """ + print >> sys.stderr, message + if self.wrapped_reject: + self.wrapped_reject(message) def __del__(self): """ @@ -59,12 +95,12 @@ class Binary(object): if not self.chunks: cmd = "ar t %s" % (self.filename) - (result, output) = commands.getstatusoutput(cmd) if result != 0: rejected = True - reject("%s: 'ar t' invocation failed." % (self.filename)) - reject(utils.prefix_multi_line_string(output, " [ar output:] "), "") + print("%s: 'ar t' invocation failed." % (self.filename)) + self.reject("%s: 'ar t' invocation failed." % (self.filename)) + self.reject(utils.prefix_multi_line_string(output, " [ar output:] ")) self.chunks = output.split('\n') @@ -74,15 +110,16 @@ class Binary(object): # a temporary directory if not self.tmpdir: - tmpdir = tempfile.mkdtemp() + tmpdir = utils.temp_dirname() cwd = os.getcwd() try: os.chdir( tmpdir ) cmd = "ar x %s %s %s" % (os.path.join(cwd,self.filename), self.chunks[1], self.chunks[2]) (result, output) = commands.getstatusoutput(cmd) if result != 0: - reject("%s: '%s' invocation failed." % (filename, cmd)) - reject(utils.prefix_multi_line_string(output, " [ar output:] "), "") + print("%s: '%s' invocation failed." % (self.filename, cmd)) + self.reject("%s: '%s' invocation failed." % (self.filename, cmd)) + self.reject(utils.prefix_multi_line_string(output, " [ar output:] ")) else: self.tmpdir = tmpdir atexit.register( self._cleanup ) @@ -90,7 +127,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 @@ -100,22 +137,27 @@ class Binary(object): """ self.__scan_ar() rejected = not self.chunks - if len(self.chunks) != 3: - rejected = True - 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 - reject("%s: first chunk is '%s', expected 'debian-binary'." % (self.filename, self.chunks[0])) - if self.chunks[1] != "control.tar.gz": + self.reject("%s: first chunk is '%s', expected 'debian-binary'." % (self.filename, self.chunks[0])) + if not rejected and self.chunks[1] != "control.tar.gz": rejected = True - reject("%s: second chunk is '%s', expected 'control.tar.gz'." % (self.filename, self.chunks[1])) - if self.chunks[2] not in [ "data.tar.bz2", "data.tar.gz" ]: + self.reject("%s: second chunk is '%s', expected 'control.tar.gz'." % (self.filename, self.chunks[1])) + if not rejected and self.chunks[2] not in [ "data.tar.bz2", "data.tar.gz" ]: rejected = True - reject("%s: third chunk is '%s', expected 'data.tar.gz' or 'data.tar.bz2'." % (self.filename, self.chunks[2])) + self.reject("%s: third chunk is '%s', expected 'data.tar.gz' or 'data.tar.bz2'." % (self.filename, self.chunks[2])) return not rejected - def scan_package(self, bootstrap_id=0): + def scan_package(self, bootstrap_id=0, relaxed=False): """ Unpack the .deb, do sanity checking, and gather info from it. @@ -123,14 +165,60 @@ 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 """ - rejected = not self.valid_deb() + result = False + rejected = not self.valid_deb(relaxed) + if not rejected: + self.__unpack() + + + cwd = os.getcwd() + if not rejected and self.tmpdir: + try: + os.chdir(self.tmpdir) + if self.chunks[1] == "control.tar.gz": + control = tarfile.open(os.path.join(self.tmpdir, "control.tar.gz" ), "r:gz") + control.extract('./control', self.tmpdir ) + if self.chunks[2] == "data.tar.gz": + data = tarfile.open(os.path.join(self.tmpdir, "data.tar.gz"), "r:gz") + elif self.chunks[2] == "data.tar.bz2": + 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()]) + 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()]) + + except: + traceback.print_exc() + + os.chdir(cwd) + self._cleanup() + return result + + def check_utf8_package(self, package): + """ + Unpack the .deb, do sanity checking, and gather info from it. + + Currently information gathering consists of getting the contents list. In + the hopefully near future, it should also include gathering info from the + control file. + + @type package: string + @param package: the name of the package to be checked + + @rtype: boolean + @return: True if the deb is valid and contents were imported + """ + rejected = not self.valid_deb(True) self.__unpack() if not rejected and self.tmpdir: @@ -139,27 +227,22 @@ class Binary(object): os.chdir(self.tmpdir) if self.chunks[1] == "control.tar.gz": control = tarfile.open(os.path.join(self.tmpdir, "control.tar.gz" ), "r:gz") - - + control.extract('control', self.tmpdir ) if self.chunks[2] == "data.tar.gz": data = tarfile.open(os.path.join(self.tmpdir, "data.tar.gz"), "r:gz") elif self.chunks[2] == "data.tar.bz2": data = tarfile.open(os.path.join(self.tmpdir, "data.tar.bz2" ), "r:bz2") - if bootstrap_id: - return DBConn().insert_content_paths(bootstrap_id, [ tarinfo.name for tarinfo in data if not tarinfo.isdir()]) - else: - pkg = deb822.Packages.iter_paragraphs( control.extractfile('./control') ).next() - return DBConn().insert_pending_content_paths(pkg, [ tarinfo.name for tarinfo in data if not tarinfo.isdir()]) + for tarinfo in data: + try: + unicode( tarinfo.name ) + except: + print >> sys.stderr, "E: %s has non-unicode filename: %s" % (package,tarinfo.name) except: traceback.print_exc() + result = False - return False - - finally: - os.chdir( cwd ) + os.chdir(cwd) -if __name__ == "__main__": - Binary( "/srv/ftp.debian.org/queue/accepted/halevt_0.1.3-2_amd64.deb" ).scan_package()