From: Chris Lamb <lamby@debian.org>
Date: Tue, 27 Oct 2009 14:40:49 +0000 (+0000)
Subject: Drop lzma support.
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;ds=sidebyside;h=794af281d5da81cd6fb49ad35ed94ecb3e4173df;p=dak.git

Drop lzma support.

Signed-off-by: Chris Lamb <lamby@debian.org>
---

diff --git a/daklib/regexes.py b/daklib/regexes.py
index f18e2a49..00896243 100755
--- a/daklib/regexes.py
+++ b/daklib/regexes.py
@@ -42,11 +42,11 @@ re_arch_from_filename = re.compile(r"/binary-[^/]+/")
 re_extract_src_version = re.compile (r"(\S+)\s*\((.*)\)")
 re_isadeb = re.compile (r"(.+?)_(.+?)_(.+)\.u?deb$")
 
-orig_source_ext_re = r"orig(?:-.+)?\.tar\.(?:gz|bz2|lzma)"
+orig_source_ext_re = r"orig(?:-.+)?\.tar\.(?:gz|bz2)"
 re_orig_source_ext = re.compile(orig_source_ext_re + "$")
-re_source_ext = re.compile("(" + orig_source_ext_re + r"|debian\.tar\.(?:gz|bz2|lzma)|diff\.gz|tar\.(?:gz|bz2|lzma)|dsc)$")
+re_source_ext = re.compile("(" + orig_source_ext_re + r"|debian\.tar\.(?:gz|bz2)|diff\.gz|tar\.(?:gz|bz2)|dsc)$")
 re_issource = re.compile(r"(.+)_(.+?)\." + re_source_ext.pattern)
-re_is_orig_source = re.compile (r"(.+)_(.+?)\.orig(?:-.+)?\.tar\.(?:gz|bz2|lzma)$")
+re_is_orig_source = re.compile (r"(.+)_(.+?)\.orig(?:-.+)?\.tar\.(?:gz|bz2)$")
 
 re_single_line_field = re.compile(r"^(\S*?)\s*:\s*(.*)")
 re_multi_line_field = re.compile(r"^\s(.*)")
diff --git a/daklib/utils.py b/daklib/utils.py
index cfee2c7e..6e363266 100755
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -366,13 +366,13 @@ def check_dsc_files(dsc_filename, dsc=None, dsc_files=None):
     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|lzma)',     ('debian_tar',)),
-        (r'orig\.tar\.(gz|bz2|lzma)',       ('orig_tar',)),
-        (r'tar\.(gz|bz2|lzma)',             ('native_tar',)),
-        (r'orig-.+\.tar\.(gz|bz2|lzma)',    ('more_orig_tar',)),
+        (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():