Merge branch 'contents' of ftp-master.debian.org:public_html/dak into contents

[dak.git] / daklib / contents.py

diff --git a/daklib/contents.py b/daklib/contents.py
index b56a9c6ce322a5913c7d767b3b13ced8aae820ad..4a0b3ae25237fe8a0b63b25f284d9d0e31903a04 100755 (executable)
--- a/daklib/contents.py
+++ b/daklib/contents.py
@@ -241,7 +241,6 @@ def generate_helper(suite_id, arch_id, overridetype_id, component_id = None):
     '''
     This function is called in a new subprocess.
     '''
-    DBConn().reset()
     session = DBConn().session()
     suite = Suite.get(suite_id, session)
     architecture = Architecture.get(arch_id, session)
@@ -308,15 +307,9 @@ class ContentsScanner(object):
         session.close()
         return { 'processed': processed, 'remaining': remaining }
 
-reset = False
-
 def scan_helper(binary_id):
     '''
     This function runs in a subprocess.
     '''
-    global reset
-    if not reset:
-        DBConn().reset()
-        reset = True
     scanner = ContentsScanner(binary_id)
     scanner.scan()