Merge branch 'debug'

diff --git a/dak/control_suite.py b/dak/control_suite.py
index fecd76405148e1c22a2beded10d1f1d267c52bbc..5392259c6002ac20e15597c8123ef4eeb8ce63c3 100755 (executable)
--- a/dak/control_suite.py
+++ b/dak/control_suite.py
@@ -445,9 +445,9 @@ def main ():
 
             if action == "set" and not suite.allowcsset:
                 if force:
-                    utils.warn("Would not normally allow setting suite {0} (allowsetcs is FALSE), but --force used".format(suite_name))
+                    utils.warn("Would not normally allow setting suite {0} (allowcsset is FALSE), but --force used".format(suite_name))
                 else:
-                    utils.fubar("Will not reset suite {0} due to its database configuration (allowsetcs is FALSE)".format(suite_name))
+                    utils.fubar("Will not reset suite {0} due to its database configuration (allowcsset is FALSE)".format(suite_name))
 
             if file_list:
                 for f in file_list:

diff --git a/daklib/checks.py b/daklib/checks.py
index 5a167ef6f2d1565015eb0c6817707b474aca5b18..2eec769def845f125f40882163541d918efbb318 100644 (file)
--- a/daklib/checks.py
+++ b/daklib/checks.py
@@ -718,6 +718,7 @@ class NoSourceOnlyCheck(Check):
         if not allow_no_arch_indep_uploads \
            and 'all' not in changes.architectures \
            and 'experimental' not in changes.distributions \
+           and 'unstable' not in changes.distributions \
            and changes.source.package_list.has_arch_indep_packages():
             raise Reject('Uploads not including architecture-independent packages are not allowed.')