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

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index 8364e626..de564be1 100644
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -7,6 +7,7 @@ class SourceFormat(type):
         klass = super(SourceFormat, cls).__new__(cls, name, bases, attrs)
         srcformats.append(klass)
 
+        assert str(klass.name)
         klass.re_format = re.compile(klass.format)
 
         return klass
@@ -14,37 +15,40 @@ class SourceFormat(type):
 class FormatOne(object):
     __metaclass__ = SourceFormat
 
+    name = '1.0'
     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):
-        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
-        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
+    def reject_msgs(cls, native_tar, native_tar_gz, debian_tar, debian_diff, orig_tar, orig_tar_gz, more_orig_tar):
+        if not (native_tar_gz or (orig_tar_gz and debian_diff)):
+            yield "no .tar.gz or .orig.tar.gz+.diff.gz in 'Files' field."
+        if (orig_tar_gz != orig_tar) or \
+           (native_tar_gz != native_tar) or \
+           debian_tar or more_orig_tar:
+            yield "contains source files not allowed in format %s" % cls.name
 
 class FormatThree(object):
     __metaclass__ = SourceFormat
 
+    name = '3.x (native)'
     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):
-        if not has_native_tar:
-            yield "%s: lack required files for format 3.x (native)." % dsc_filename
-        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
+    def reject_msgs(cls, native_tar, native_tar_gz, debian_tar, debian_diff, orig_tar, orig_tar_gz, more_orig_tar):
+        if not native_tar:
+            yield "lack required files for format %s" % cls.name
+        if orig_tar or debian_diff or debian_tar or more_orig_tar:
+            yield "contains source files not allowed in format %s" % cls.name
 
 class FormatThreeQuilt(object):
     __metaclass__ = SourceFormat
 
+    name = '3.x (quilt)'
     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):
-        if not(has_orig_tar and has_debian_tar):
-            yield "%s: lack required files for format '3.x (quilt)'." % dsc_filename
-        if has_debian_diff or has_native_tar:
-            yield "%s: contains source files not allowed in format 3.x (quilt)" % dsc_filename
+    def reject_msgs(cls, native_tar, native_tar_gz, debian_tar, debian_diff, orig_tar, orig_tar_gz, more_orig_tar):
+        if not(orig_tar and debian_tar):
+            yield "lack required files for format %s" % cls.name
+        if debian_diff or native_tar:
+            yield "contains source files not allowed in format %s" % cls.name