Merge remote-tracking branch 'origin/master'

[dak.git] / daklib / archive.py

diff --git a/daklib/archive.py b/daklib/archive.py
index 6d3d334e8f1cf981a0b1997a39194db1c1057374..81719a8731871ef2a4e24903328f518d80774f57 100644 (file)
--- a/daklib/archive.py
+++ b/daklib/archive.py
@@ -718,7 +718,7 @@ class ArchiveUpload(object):
             elif rtype == "reject":
                 rejected = fields[1]
                 if suite_name == rejected:
-                    self.reject_reasons.append('Uploads to {0} are not accepted.'.format(suite))
+                    raise checks.Reject('Uploads to {0} are not accepted.'.format(rejected))
             ## XXX: propup-version and map-unreleased not yet implemented
         return suite_name
 
@@ -1076,7 +1076,9 @@ class ArchiveUpload(object):
                 remaining.append(f)
                 continue
 
-            if rule['Source'] != self.changes.source_name or rule['Section'] != f.section or rule['Extension'] != ext:
+            if rule['Source'] != self.changes.source_name \
+                    or rule['Section'] != f.section \
+                    or ('Extension' in rule and rule['Extension'] != ext):
                 remaining.append(f)
                 continue