X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fchecks.py;h=5b4cafe35ccc93ef01159d4575136d8784b63f74;hb=1297e2ed83ef4e15bff474e00e3f0ac14c689252;hp=019654caf278f7486c4504e63d68221d75283588;hpb=47f4f001c55284e717818f14b8f9eace3e682b56;p=dak.git

diff --git a/daklib/checks.py b/daklib/checks.py
index 019654ca..5b4cafe3 100644
--- a/daklib/checks.py
+++ b/daklib/checks.py
@@ -375,7 +375,10 @@ class SourceCheck(Check):
 
         version = control['Version']
         if is_orig:
-            version = re_field_version_upstream.match(version).group('upstream')
+            upstream_match = re_field_version_upstream.match(version)
+            if not upstream_match:
+                raise Reject('{0}: Source package includes upstream tarball, but {0} has no Debian revision.'.format(filename, version))
+            version = upstream_match.group('upstream')
         version_match =  re_field_version.match(version)
         version_without_epoch = version_match.group('without_epoch')
         if match.group('version') != version_without_epoch:
@@ -440,7 +443,7 @@ class ACLCheck(Check):
                 .filter(DBBinary.package == binary_name)
             for binary in binaries:
                 if binary.source.source != upload.changes.changes['Source']:
-                    return True, binary, binary.source.source
+                    return True, binary.package, binary.source.source
         return False, None, None
 
     def _check_acl(self, session, upload, acl):