X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=fd4d7bbf8ed2fa6478836c229d8f138b874ec6f7;hb=557166746172f6e479aa83461a455d4eb9e9d8ee;hp=a9909c66004ec2748321e8b74857237c15c5c43f;hpb=42b695c3cb0d5a6e830d7473441bbe09e8f09b3c;p=dak.git

diff --git a/daklib/utils.py b/daklib/utils.py
index a9909c66..fd4d7bbf 100755
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -152,12 +152,10 @@ def extract_component_from_section(section):
 
 ################################################################################
 
-@session_wrapper
 def parse_deb822(armored_contents, signing_rules=0, keyrings=None, session=None):
-    if keyrings == None:
-        keyrings = [ k.keyring_name for k in session.query(Keyring).filter(Keyring.active == True).all() ]
     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)
@@ -227,8 +225,7 @@ def parse_deb822(armored_contents, signing_rules=0, keyrings=None, session=None)
 
 ################################################################################
 
-@session_wrapper
-def parse_changes(filename, signing_rules=0, dsc_file=0, keyrings=None, session=None):
+def parse_changes(filename, signing_rules=0, dsc_file=0, keyrings=None):
     """
     Parses a changes file and returns a dictionary where each field is a
     key.  The mandatory first argument is the filename of the .changes
@@ -257,7 +254,7 @@ def parse_changes(filename, signing_rules=0, dsc_file=0, keyrings=None, session=
         unicode(content, 'utf-8')
     except UnicodeError:
         raise ChangesUnicodeError, "Changes file not proper utf-8"
-    changes = parse_deb822(content, signing_rules, keyrings=keyrings, session=session)
+    changes = parse_deb822(content, signing_rules, keyrings=keyrings)
 
 
     if not dsc_file:
@@ -398,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():