Acquire a lock in the main process when writing Contents

[dak.git] / daklib / utils.py

diff --git a/daklib/utils.py b/daklib/utils.py
index cdec3a773865c7faee74a41b063b892a59f2dc19..5ac015cd0864398d5e1f99ad71a27fb4547aaf0f 100644 (file)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -316,8 +316,10 @@ def check_dsc_files(dsc_filename, dsc, dsc_files):
         (r'tar.gz',                    ('native_tar_gz', 'native_tar')),
         (r'debian\.tar\.(gz|bz2|xz)',  ('debian_tar',)),
         (r'orig\.tar\.(gz|bz2|xz)',    ('orig_tar',)),
+        (r'orig\.tar\.(gz|bz2|xz)\.asc', ('orig_tar_sig',)),
         (r'tar\.(gz|bz2|xz)',          ('native_tar',)),
         (r'orig-.+\.tar\.(gz|bz2|xz)', ('more_orig_tar',)),
+        (r'orig-.+\.tar\.(gz|bz2|xz)\.asc', ('more_orig_tar_sig',)),
     )
 
     for f in dsc_files:
@@ -341,7 +343,7 @@ def check_dsc_files(dsc_filename, dsc, dsc_files):
             reject("%s: unexpected source file '%s'" % (dsc_filename, f))
 
     # Check for multiple files
-    for file_type in ('orig_tar', 'native_tar', 'debian_tar', 'debian_diff'):
+    for file_type in ('orig_tar', 'orig_tar_sig', 'native_tar', 'debian_tar', 'debian_diff'):
         if has[file_type] > 1:
             rejmsg.append("%s: lists multiple %s" % (dsc_filename, file_type))
 
@@ -1256,7 +1258,7 @@ def check_reverse_depends(removals, suite, arches=None, session=None, cruft=Fals
            FROM source s
            JOIN source_metadata sm ON s.id = sm.src_id
            WHERE s.id in
-               (SELECT source FROM src_associations
+               (SELECT src FROM newest_src_association
                    WHERE suite = :suite_id)
                AND sm.key_id in :metakey_ids
            GROUP BY s.id, s.source'''