X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fchecks.py;h=f210d186e43318be8859e2f39658055d52506d12;hb=0fab53cccada95ca246bc88fe4ba95a653f716db;hp=664bca3e1c966a28d3ea2c7fd3b0708ff8b794ac;hpb=a7f77393881783e65423f1f36778c67c52e5213d;p=dak.git diff --git a/daklib/checks.py b/daklib/checks.py index 664bca3e..f210d186 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: @@ -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)