[dak/master 14/29] Don't pass dsc_filename to reject_msgs; prepend it in check_dsc_files.
Signed-off-by: Chris Lamb <lamby@debian.org>
---
daklib/srcformats.py | 18 +++++++++---------
daklib/utils.py | 6 +++---
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index 8364e62..5c9a9e0 100644
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -17,13 +17,13 @@ class FormatOne(object):
format = r'1.0'
@classmethod
- def reject_msgs(cls, dsc_filename, has_native_tar, has_native_tar_gz, has_debian_tar, has_debian_diff, has_orig_tar, has_orig_tar_gz, has_more_orig_tar):
+ def reject_msgs(cls, has_native_tar, has_native_tar_gz, has_debian_tar, has_debian_diff, has_orig_tar, has_orig_tar_gz, has_more_orig_tar):
if not (has_native_tar_gz or (has_orig_tar_gz and has_debian_diff)):
- yield "%s: no .tar.gz or .orig.tar.gz+.diff.gz in 'Files' field." % dsc_filename
+ yield "no .tar.gz or .orig.tar.gz+.diff.gz in 'Files' field."
if (has_orig_tar_gz != has_orig_tar) or \
(has_native_tar_gz != has_native_tar) or \
has_debian_tar or has_more_orig_tar:
- yield "%s: contains source files not allowed in format 1.0" % dsc_filename
+ yield "contains source files not allowed in format 1.0"
class FormatThree(object):
__metaclass__ = SourceFormat
@@ -31,11 +31,11 @@ class FormatThree(object):
format = r'3\.\d+ \(native\)'
@classmethod
- def reject_msgs(cls, dsc_filename, has_native_tar, has_native_tar_gz, has_debian_tar, has_debian_diff, has_orig_tar, has_orig_tar_gz, has_more_orig_tar):
+ def reject_msgs(cls, has_native_tar, has_native_tar_gz, has_debian_tar, has_debian_diff, has_orig_tar, has_orig_tar_gz, has_more_orig_tar):
if not has_native_tar:
- yield "%s: lack required files for format 3.x (native)." % dsc_filename
+ yield "lack required files for format 3.x (native)."
if has_orig_tar or has_debian_diff or has_debian_tar or has_more_orig_tar:
- yield "%s: contains source files not allowed in format '3.x (native)'" % dsc_filename
+ yield "contains source files not allowed in format '3.x (native)'"
class FormatThreeQuilt(object):
__metaclass__ = SourceFormat
@@ -43,8 +43,8 @@ class FormatThreeQuilt(object):
format = r'3\.\d+ \(quilt\)'
@classmethod
- def reject_msgs(cls, dsc_filename, has_native_tar, has_native_tar_gz, has_debian_tar, has_debian_diff, has_orig_tar, has_orig_tar_gz, has_more_orig_tar):
+ def reject_msgs(cls, has_native_tar, has_native_tar_gz, has_debian_tar, has_debian_diff, has_orig_tar, has_orig_tar_gz, has_more_orig_tar):
if not(has_orig_tar and has_debian_tar):
- yield "%s: lack required files for format '3.x (quilt)'." % dsc_filename
+ yield "lack required files for format '3.x (quilt)'."
if has_debian_diff or has_native_tar:
- yield "%s: contains source files not allowed in format 3.x (quilt)" % dsc_filename
+ yield "contains source files not allowed in format 3.x (quilt)"
diff --git a/daklib/utils.py b/daklib/utils.py
index ea2f8b7..429fd29 100755
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -402,8 +402,7 @@ def check_dsc_files(dsc_filename, dsc=None, dsc_files=None):
for format in srcformats:
if format.re_format.match(dsc['format']):
- rejmsg.extend(format.reject_msgs(
- dsc_filename,
+ msgs = format.reject_msgs(
has_native_tar,
has_native_tar_gz,
has_debian_tar,
@@ -411,7 +410,8 @@ def check_dsc_files(dsc_filename, dsc=None, dsc_files=None):
has_orig_tar,
has_orig_tar_gz,
has_more_orig_tar
- ))
+ )
+ rejmsg.extend(['%s: %s' % (dsc_filename, x) for x in msgs])
break
return rejmsg
--
1.6.3.3
Reply to: