X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=413bcb6dcc79b51f245ee87a151216953c28713b;hb=34d31a60a7db0024d3194adf0004ff916de34b0a;hp=7c1243c91e123add4bfbce3537f212331344ac3d;hpb=7b16dbdee739c035838740b7284927020033bee1;p=dak.git

diff --git a/daklib/utils.py b/daklib/utils.py
index 7c1243c9..413bcb6d 100755
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -143,20 +143,20 @@ def extract_component_from_section(section):
 
     # Expand default component
     if component == "":
-        if Cnf.has_key("Component::%s" % section):
-            component = section
-        else:
+        comp = get_component(section)
+        if comp is None:
             component = "main"
+        else:
+            component = comp.componant_name
 
     return (section, component)
 
 ################################################################################
 
-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)
@@ -396,10 +396,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():