[dak/master] Corrected a bug with the handling of DM-Upload-Allowed and experimental suites of the archive
Closes: #506587 and #502943
Signed-off-by: Michael Casadevall <sonicmctails@gmail.com>
---
ChangeLog | 3 +++
dak/process_unchecked.py | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9503636..c1b8944 100644
--- 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 2a479ce..1d63a02 100755
--- 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])
--
1.5.6.5
Reply to: