Corrected a bug with the handling of DM-Upload-Allowed and experimental suites of...

Closes: #506587 and #502943
Signed-off-by: Michael Casadevall <sonicmctails@gmail.com>

diff --git a/ChangeLog b/ChangeLog
index 950363612df2830344782d35eda471a6ce009fe4..c1b8944e6d23b4fda62e57726bf8d3ffc3f62f38 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
         * dak/process_unchecked.py - Implemented new dm_upload_allowed field in source
 
+        * dak/process_unchecked.py - Fixed bug where dm-upload-allowed would not be respected
+          in cases where only experimental had the DM-Upload-Allowed: yes flag.
+
         * dak/process_accepted.py - Ditto, also causes new uploads to include uploaders
           table to properly include all uploads
 

diff --git a/dak/process_unchecked.py b/dak/process_unchecked.py
index 2a479ced62e457ff29a897b08901dcf0270cba32..1d63a024a4a2e2b35cc45109c40f63294d79ea64 100755 (executable)
--- a/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@ -1045,6 +1045,7 @@ def check_signed_by_key():
         source_ids = []
         check_suites = changes["distribution"].keys()
         if "unstable" not in check_suites: check_suites.append("unstable")
+        if "experimental" not in check_suites: check_suites.append("experimental")
         for suite in check_suites:
             suite_id = database.get_suite_id(suite)
             q = Upload.projectB.query("SELECT s.id FROM source s JOIN src_associations sa ON (s.id = sa.source) WHERE s.source = '%s' AND sa.suite = %d" % (changes["source"], suite_id))
@@ -1053,7 +1054,6 @@ def check_signed_by_key():
 
         is_nmu = 1
         for si in source_ids:
-            is_nmu = 1
             q = Upload.projectB.query("SELECT m.name FROM maintainer m WHERE m.id IN (SELECT su.maintainer FROM src_uploaders su JOIN source s ON (s.id = su.source) WHERE su.source = %s AND s.dm_upload_allowed = 'yes')" % (si))
             for m in q.getresult():
                 (rfc822, rfc2047, name, email) = utils.fix_maintainer(m[0])