Merge remote branch 'ansgar/signatures-2' into merge

* ansgar/signatures-2:
  daklib/gpg.py: use os._exit() instead of sys.exit() in child process
  daklib/utils.py (parse_deb822, parse_changes): use session_wrapper

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/daklib/gpg.py b/daklib/gpg.py
index 90103afa0ddc20ae98457e34314d0407714f2f8b..0e080df5a6558164bb259a9b529cc2087dcfa611 100644 (file)
--- a/daklib/gpg.py
+++ b/daklib/gpg.py
@@ -23,7 +23,6 @@ import errno
 import fcntl
 import os
 import select
-import sys
 
 try:
     _MAXFD = os.sysconf("SC_OPEN_MAX")
@@ -185,6 +184,6 @@ class SignedFile(object):
 
             os.execvp(self.gpg, args)
         finally:
-            sys.exit(1)
+            os._exit(1)
 
 # vim: set sw=4 et:

diff --git a/daklib/utils.py b/daklib/utils.py
index 7c1243c91e123add4bfbce3537f212331344ac3d..a9909c66004ec2748321e8b74857237c15c5c43f 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -152,9 +152,10 @@ def extract_component_from_section(section):
 
 ################################################################################
 
-def parse_deb822(armored_contents, signing_rules=0, keyrings=None):
+@session_wrapper
+def parse_deb822(armored_contents, signing_rules=0, keyrings=None, session=None):
     if keyrings == None:
-        keyrings = [ k.keyring_name for k in DBConn().session().query(Keyring).filter(Keyring.active == True).all() ]
+        keyrings = [ k.keyring_name for k in session.query(Keyring).filter(Keyring.active == True).all() ]
     require_signature = True
     if signing_rules == -1:
         require_signature = False
@@ -226,7 +227,8 @@ def parse_deb822(armored_contents, signing_rules=0, keyrings=None):
 
 ################################################################################
 
-def parse_changes(filename, signing_rules=0, dsc_file=0, keyrings=None):
+@session_wrapper
+def parse_changes(filename, signing_rules=0, dsc_file=0, keyrings=None, session=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
@@ -255,7 +257,7 @@ def parse_changes(filename, signing_rules=0, dsc_file=0, keyrings=None):
         unicode(content, 'utf-8')
     except UnicodeError:
         raise ChangesUnicodeError, "Changes file not proper utf-8"
-    changes = parse_deb822(content, signing_rules, keyrings=keyrings)
+    changes = parse_deb822(content, signing_rules, keyrings=keyrings, session=session)
 
 
     if not dsc_file: