Merge branch 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak

* 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak:
  daklib/checks.py: give a nice error for sources with invalid versions

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/daklib/checks.py b/daklib/checks.py
index 019654caf278f7486c4504e63d68221d75283588..f210d186e43318be8859e2f39658055d52506d12 100644 (file)
--- 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: