Merge branch 'master' into contents

[dak.git] / daklib / contents.py

diff --git a/daklib/contents.py b/daklib/contents.py
index dffb425e3cc2e5f8c5245de9e209fdaaa7a1f454..2a29b2e55b5080eadc574e559edf38a22ae1615a 100755 (executable)
--- a/daklib/contents.py
+++ b/daklib/contents.py
@@ -190,12 +190,8 @@ select bc.file, string_agg(o.section || '/' || b.package, ',' order by b.package
         gzip.stdin.close()
         output_file.close()
         gzip.wait()
-        try:
-            os.remove(final_filename)
-        except:
-            pass
+        os.chmod(temp_filename, 0664)
         os.rename(temp_filename, final_filename)
-        os.chmod(final_filename, 0664)
 
     @classmethod
     def log_result(class_, result):
@@ -426,10 +422,13 @@ class SourceContentsScanner(object):
         session.close()
         return { 'processed': processed, 'remaining': remaining }
 
-def source_scan_helper(binary_id):
+def source_scan_helper(source_id):
     '''
     This function runs in a subprocess.
     '''
-    scanner = SourceContentsScanner(source_id)
-    scanner.scan()
+    try:
+        scanner = SourceContentsScanner(source_id)
+        scanner.scan()
+    except Exception, e:
+        print e