X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fbinary.py;h=d1f78f3ae0cd4b908fb389b2e2683d0dc4c0625b;hb=4830d9be143c7645ea932b53fae095e275ad7814;hp=a079763b45dc63b0d52ac71aff38c26ca7eed82b;hpb=0d010f52896222de24d4403f37829ba73db8db90;p=dak.git

diff --git a/daklib/binary.py b/daklib/binary.py
old mode 100755
new mode 100644
index a079763b..d1f78f3a
--- a/daklib/binary.py
+++ b/daklib/binary.py
@@ -42,40 +42,53 @@ 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
+
+try:
+    # starting with squeeze
+    from debian import deb822
+except:
+    # up to lenny
+    from debian_bundle import deb822
+
+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):
         """
         if we were given a reject function, send the reject message,
         otherwise send it to stderr.
         """
+        print >> sys.stderr, message
+        self.rejects.append(message)
         if self.wrapped_reject:
             self.wrapped_reject(message)
-        else:
-            print >> sys.stderr, message
 
     def __del__(self):
         """
@@ -99,6 +112,7 @@ class Binary(object):
             (result, output) = commands.getstatusoutput(cmd)
             if result != 0:
                 rejected = True
+                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')
@@ -117,6 +131,7 @@ class Binary(object):
                 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:
+                    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:
@@ -126,7 +141,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
@@ -136,9 +151,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]))
@@ -151,7 +171,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.
 
@@ -159,41 +179,46 @@ 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()
-        self.__unpack()
-
         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()
+            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 = 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 = insert_pending_content_paths(pkg,
+                                                              self.filename.endswith('.udeb'),
+                                                              [tarinfo.name for tarinfo in data if not tarinfo.isdir()],
+                                                              session)
+
+                except:
+                    traceback.print_exc()
 
-        os.chdir(cwd)
+            os.chdir(cwd)
+        self._cleanup()
         return result
 
     def check_utf8_package(self, package):
@@ -204,14 +229,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:
@@ -232,12 +256,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)
 
-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(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')
+