From: Joerg Jaspert Date: Thu, 9 May 2013 19:13:25 +0000 (+0200) Subject: Merge branch 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=2731a125c036c377da2ed04b2dd2f56bdac32534;hp=1af93dacd246510db6fa04b3449402ba60bf71b3;p=dak.git 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 --- diff --git a/daklib/checks.py b/daklib/checks.py index 019654ca..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: