X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=c1d78e3ce08d28a1e4e49ff3764180d78d2d018f;hb=1242127976118dbf4c73a9132db3481d72906c86;hp=b9fc2cfce5b198f3382974cd688d9c4d8226d7f2;hpb=1136f901e22480f5f7c1c18e91c54ebfe07513cc;p=dak.git

diff --git a/daklib/utils.py b/daklib/utils.py
index b9fc2cfc..c1d78e3c 100755
--- 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,