X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fsrcformats.py;h=5c9a9e0ecde9a33efeb6c79900584c2038b4f7c7;hb=324bbf00a048e5d26048d7b9eca335341a0440b1;hp=8364e6268ba757a0c4904fc5e4422a8b32646e0f;hpb=5e1a34528993b82c0c57f93b16e09cc686af9c82;p=dak.git

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index 8364e626..5c9a9e0e 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)"