From: Niels Thykier Date: Mon, 14 Dec 2015 20:46:28 +0000 (+0000) Subject: daklib/upload.py: Silently accept and discard .buildinfo files X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=41a349d2ea5eb48af50e1e672ce4333594a9ffe5;p=dak.git daklib/upload.py: Silently accept and discard .buildinfo files Besides some very trivial validation of the filename, accept .buildinfo files without really looking at them. Signed-off-by: Niels Thykier --- diff --git a/daklib/regexes.py b/daklib/regexes.py index ae8fd91d..8b548ce9 100644 --- a/daklib/regexes.py +++ b/daklib/regexes.py @@ -141,6 +141,10 @@ re_file_source = re.compile(_re_file_prefix + r'(?:(?:\.orig(?:-[a-zA-Z0-9-]+)?| # Groups: package, version re_file_orig = re.compile(_re_file_prefix + r'\.orig(?:-[a-zA-Z0-9-]+)?(?:\.tar\.(?:bz2|gz|xz)|\.asc)') +# Match buildinfo file +# Groups: package, version, suffix +re_file_buildinfo = re.compile(_re_file_prefix + r'_(?P[a-zA-Z0-9+]+)\.buildinfo$') + ###################################################################### # Patterns matching fields # ###################################################################### diff --git a/daklib/upload.py b/daklib/upload.py index b78d100f..4c10f45f 100644 --- a/daklib/upload.py +++ b/daklib/upload.py @@ -374,6 +374,8 @@ class Changes(object): for f in self.files.itervalues(): if re_file_dsc.match(f.filename) or re_file_source.match(f.filename) or re_file_binary.match(f.filename): continue + if re_file_buildinfo.match(f.filename): + continue if f.section != 'byhand' and f.section[:4] != 'raw-': raise InvalidChangesException("{0}: {1} looks like a byhand package, but is in section {2}".format(self.filename, f.filename, f.section)) byhand.append(f)