daklib/checks.py: give a nice error for sources with invalid versions

[dak.git] / daklib / checks.py

diff --git a/daklib/checks.py b/daklib/checks.py
index 664bca3e1c966a28d3ea2c7fd3b0708ff8b794ac..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:
@@ -644,7 +647,7 @@ class LintianCheck(Check):
             if user is not None:
                 cmd.extend(['sudo', '-H', '-u', user])
 
-            cmd.extend(['/usr/bin/lintian', '--show-overrides', '--tags-from-file', temp_filename, changespath])
+            cmd.extend(['LINTIAN_COLL_UNPACKED_SKIP_SIG=1', '/usr/bin/lintian', '--show-overrides', '--tags-from-file', temp_filename, changespath])
             result, output = commands.getstatusoutput(" ".join(cmd))
         finally:
             os.unlink(temp_filename)