Add .xz as a valid extension in various places.

[dak.git] / daklib / utils.py

diff --git a/daklib/utils.py b/daklib/utils.py
index b9fc2cfce5b198f3382974cd688d9c4d8226d7f2..fd4d7bbf8ed2fa6478836c229d8f138b874ec6f7 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -152,11 +152,10 @@ def extract_component_from_section(section):
 
 ################################################################################
 
-def parse_deb822(armored_contents, signing_rules=0, keyrings=None):
-    if keyrings == None:
-        keyrings = [ k.keyring_name for k in DBConn().session().query(Keyring).filter(Keyring.active == True).all() ]
+def parse_deb822(armored_contents, signing_rules=0, keyrings=None, session=None):
     require_signature = True
-    if signing_rules == -1:
+    if keyrings == None:
+        keyrings = []
         require_signature = False
 
     signed_file = SignedFile(armored_contents, keyrings=keyrings, require_signature=require_signature)
@@ -209,7 +208,7 @@ def parse_deb822(armored_contents, signing_rules=0, keyrings=None):
             continue
         error += line
 
-    changes["filecontents"] = "".join(lines)
+    changes["filecontents"] = armored_contents
 
     if changes.has_key("source"):
         # Strip the source version in brackets from the source field,
@@ -396,10 +395,10 @@ def check_dsc_files(dsc_filename, dsc=None, dsc_files=None):
         (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',)),
+        (r'debian\.tar\.(gz|bz2|xz)',  ('debian_tar',)),
+        (r'orig\.tar\.(gz|bz2|xz)',    ('orig_tar',)),
+        (r'tar\.(gz|bz2|xz)',          ('native_tar',)),
+        (r'orig-.+\.tar\.(gz|bz2|xz)', ('more_orig_tar',)),
     )
 
     for f in dsc_files.keys():