X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=1b35feef2eb697e930152b85ca612b3f1ea9e29e;hb=9f371390bb90395b2f2f0b65c91c21047896774a;hp=85ef0b5573b86649c1e57030c37332d4263e6b7f;hpb=a4baee479f3b5d5351d9f873f1bbf8a62028d044;p=dak.git

diff --git a/daklib/utils.py b/daklib/utils.py
index 85ef0b55..1b35feef 100755
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -37,11 +37,14 @@ import stat
 import apt_pkg
 import database
 import time
+import tarfile
+import re
+import string
 import email as modemail
 from dak_exceptions import *
 from regexes import re_html_escaping, html_escaping, re_single_line_field, \
                     re_multi_line_field, re_srchasver, re_verwithext, \
-                    re_parse_maintainer, re_taint_free, re_gpg_uid
+                    re_parse_maintainer, re_taint_free, re_gpg_uid, re_re_mark
 
 ################################################################################
 
@@ -607,11 +610,10 @@ def send_mail (message, filename=""):
 
         whitelist = [];
         whitelist_in = open_file(Cnf["Dinstall::MailWhiteList"])
-        RE_mark = re.compile(r'^RE:')
         try:
             for line in whitelist_in:
-                if RE_mark.match(line):
-                    whitelist.append(re.compile(RE_mark.sub("", line.strip(), 1)))
+                if re_re_mark.match(line):
+                    whitelist.append(re.compile(re_re_mark.sub("", line.strip(), 1)))
                 else:
                     whitelist.append(re.compile(re.escape(line.strip())))
         finally:
@@ -1499,3 +1501,53 @@ if which_conf_file() != default_config:
     apt_pkg.ReadConfigFileISC(Cnf,which_conf_file())
 
 ################################################################################
+
+def generate_contents_information(filename):
+    """
+    Generate a list of flies contained in a .deb
+
+    @type filename: string
+    @param filename: the path to a data.tar.gz or data.tar.bz2
+
+    @rtype: list
+    @return: a list of files in the data.tar.* portion of the .deb
+    """
+    cmd = "ar t %s" % (filename)
+    (result, output) = commands.getstatusoutput(cmd)
+    if result != 0:
+        reject("%s: 'ar t' invocation failed." % (filename))
+        reject(utils.prefix_multi_line_string(output, " [ar output:] "), "")
+
+    # Ugh ... this is ugly ... Code ripped from process_unchecked.py
+    chunks = output.split('\n')
+
+    contents = []
+    try:
+        cmd = "ar x %s %s" % (filename, 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:] "), "")
+
+        # Got deb tarballs, now lets go through and determine what bits
+        # and pieces the deb had ...
+        if chunks[2] == "data.tar.gz":
+            data = tarfile.open("data.tar.gz", "r:gz")
+        elif chunks[2] == "data.tar.bz2":
+            data = tarfile.open("data.tar.bz2", "r:bz2")
+        else:
+            os.remove(chunks[2])
+            reject("couldn't find data.tar.*")
+
+        for tarinfo in data:
+            if not tarinfo.isdir():
+                contents.append(tarinfo.name[2:])
+
+    finally:
+        if os.path.exists( chunks[2] ):
+            shutil.rmtree( chunks[2] )
+            os.remove( chunks[2] )
+
+    return contents
+
+###############################################################################