Add process-commands program and activate new DM implementation.

[dak.git] / daklib / checks.py

diff --git a/daklib/checks.py b/daklib/checks.py
index f073d52fa43bc3d785667b7f15ce355ffd5941f5..cae801e489f341c370d22ad982313ff0553fe4b6 100644 (file)
--- a/daklib/checks.py
+++ b/daklib/checks.py
@@ -174,8 +174,8 @@ class HashesCheck(Check):
             for f in changes.files.itervalues():
                 f.check(upload.directory)
             source = changes.source
-            what = source.filename
             if source is not None:
+                what = source.filename
                 for f in source.files.itervalues():
                     f.check(upload.directory)
         except IOError as e:
@@ -464,8 +464,11 @@ class ACLCheck(Check):
             # XXX: Drop DMUA part here and switch to new implementation.
             # XXX: Send warning mail once users can set the new DMUA flag
             dmua_status, dmua_reason = self._check_dmua(upload)
-            if not dmua_status:
-                return False, dmua_reason
+            if acl_per_source is None:
+                if not dmua_status:
+                    return False, dmua_reason
+                else:
+                    upload.warn('DM flag not set, but accepted as DMUA was set.')
             #if acl_per_source is None:
             #    return False, "not allowed to upload source package '{0}'".format(source_name)
         if acl.deny_per_source and acl_per_source is not None: