X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=788bcd41eda0d44a008a516137f6513ed6ee7410;hb=a5d7d22121e018672da9dd74c89c046fb4dba1f9;hp=c4f93fe5f651cc2b8bc5c6b82861a548f554aebc;hpb=9dd35112e98631a7e367d2dd6cc3b05ba1a4ea3a;p=dak.git

diff --git a/daklib/utils.py b/daklib/utils.py
index c4f93fe5..788bcd41 100755
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -22,7 +22,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-import codecs
 import commands
 import email.Header
 import os
@@ -39,14 +38,15 @@ import time
 import re
 import string
 import email as modemail
+import subprocess
 
 from dbconn import DBConn, get_architecture, get_component, get_suite
 from dak_exceptions import *
 from textutils import fix_maintainer
 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_re_mark, re_whitespace_comment, re_issource
+                    re_taint_free, re_gpg_uid, re_re_mark, \
+                    re_whitespace_comment, re_issource
 
 from srcformats import srcformats
 from collections import defaultdict
@@ -63,6 +63,22 @@ key_uid_email_cache = {}  #: Cache for email addresses from gpg key uids
 known_hashes = [("sha1", apt_pkg.sha1sum, (1, 8)),
                 ("sha256", apt_pkg.sha256sum, (1, 8))] #: hashes we accept for entries in .changes/.dsc
 
+# Monkeypatch commands.getstatusoutput as it returns a "0" exit code in
+# all situations under lenny's Python.
+import commands
+def dak_getstatusoutput(cmd):
+    pipe = subprocess.Popen(cmd, shell=True, universal_newlines=True,
+        stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+
+    output = "".join(pipe.stdout.readlines())
+
+    ret = pipe.wait()
+    if ret is None:
+        ret = 0
+
+    return ret, output
+commands.getstatusoutput = dak_getstatusoutput
+
 ################################################################################
 
 def html_escape(s):
@@ -365,38 +381,42 @@ def check_dsc_files(dsc_filename, dsc=None, dsc_files=None):
     # announced
     has = defaultdict(lambda: 0)
 
+    ftype_lookup = (
+        (r'orig.tar.gz',               ('orig_tar_gz', 'orig_tar')),
+        (r'diff.gz',                   ('debian_diff',)),
+        (r'tar.gz',                    ('native_tar_gz', 'native_tar')),
+        (r'debian\.tar\.(gz|bz2)',     ('debian_tar',)),
+        (r'orig\.tar\.(gz|bz2)',       ('orig_tar',)),
+        (r'tar\.(gz|bz2)',             ('native_tar',)),
+        (r'orig-.+\.tar\.(gz|bz2)',    ('more_orig_tar',)),
+    )
+
     for f in dsc_files.keys():
         m = re_issource.match(f)
         if not m:
             rejmsg.append("%s: %s in Files field not recognised as source."
                           % (dsc_filename, f))
             continue
-        ftype = m.group(3)
-        if ftype == "orig.tar.gz":
-            has['orig_tar_gz'] += 1
-            has['orig_tar'] += 1
-        elif ftype == "diff.gz":
-            has['debian_diff'] += 1
-        elif ftype == "tar.gz":
-            has['native_tar_gz'] += 1
-            has['native_tar'] += 1
-        elif re.match(r"debian\.tar\.(gz|bz2|lzma)", ftype):
-            has['debian_tar'] += 1
-        elif re.match(r"orig\.tar\.(gz|bz2|lzma)", ftype):
-            has['orig_tar'] += 1
-        elif re.match(r"tar\.(gz|bz2|lzma)", ftype):
-            has['native_tar'] += 1
-        elif re.match(r"orig-.+\.tar\.(gz|bz2|lzma)", ftype):
-            has['more_orig_tar'] += 1
-        else:
+
+        # Populate 'has' dictionary by resolving keys in lookup table
+        matched = False
+        for regex, keys in ftype_lookup:
+            if re.match(regex, m.group(3)):
+                matched = True
+                for key in keys:
+                    has[key] += 1
+                break
+
+        # File does not match anything in lookup table; reject
+        if not matched:
             reject("%s: unexpected source file '%s'" % (dsc_filename, f))
-    if has['orig_tar'] > 1:
-        rejmsg.append("%s: lists multiple .orig tarballs." % (dsc_filename))
-    if has['native_tar'] > 1:
-        rejmsg.append("%s: lists multiple native tarballs." % (dsc_filename))
-    if has['debian_tar'] > 1 or has['debian_diff'] > 1:
-        rejmsg.append("%s: lists multiple debian diff/tarballs." % (dsc_filename))
 
+    # Check for multiple files
+    for file_type in ('orig_tar', 'native_tar', 'debian_tar', 'debian_diff'):
+        if has[file_type] > 1:
+            rejmsg.append("%s: lists multiple %s" % (dsc_filename, file_type))
+
+    # Source format specific tests
     for format in srcformats:
         if format.re_format.match(dsc['format']):
             rejmsg.extend([