Merge commit 'lamby/deb-src-3.0-sqla' into merge

[dak.git] / daklib / srcformats.py

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index de564be17dbc3d017f839395dce6d0faaec2d142..0a74c19262f99fe91e6476487cabd39bf8f22faa 100644 (file)
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -8,47 +8,58 @@ class SourceFormat(type):
         srcformats.append(klass)
 
         assert str(klass.name)
+        assert iter(klass.requires)
+        assert iter(klass.disallowed)
+
         klass.re_format = re.compile(klass.format)
 
         return klass
 
-class FormatOne(object):
+    @classmethod
+    def reject_msgs(cls, has):
+        if len(cls.requires) != len([x for x in cls.requires if has[x]]):
+            yield "lack of required files for format %s" % cls.name
+
+        for key in cls.disallowed:
+            if has[key]:
+                yield "contains source files not allowed in format %s" % cls.name
+
+class FormatOne(SourceFormat):
     __metaclass__ = SourceFormat
 
     name = '1.0'
     format = r'1.0'
 
+    requires = ()
+    disallowed = ('debian_tar', 'more_orig_tar')
+
     @classmethod
-    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)):
+    def reject_msgs(cls, has):
+        if not (has['native_tar_gz'] or (has['orig_tar_gz'] and has['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:
+        if has['native_tar_gz'] and has['debian_diff']:
+            yield "native package with diff makes no sense"
+        if (has['orig_tar_gz'] != has['orig_tar']) or \
+           (has['native_tar_gz'] != has['native_tar']):
             yield "contains source files not allowed in format %s" % cls.name
 
-class FormatThree(object):
+        for msg in super(FormatOne, cls).reject_msgs(has):
+            yield msg
+
+class FormatThree(SourceFormat):
     __metaclass__ = SourceFormat
 
     name = '3.x (native)'
     format = r'3\.\d+ \(native\)'
 
-    @classmethod
-    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
+    requires = ('native_tar',)
+    disallowed = ('orig_tar', 'debian_diff', 'debian_tar', 'more_orig_tar')
 
-class FormatThreeQuilt(object):
+class FormatThreeQuilt(SourceFormat):
     __metaclass__ = SourceFormat
 
     name = '3.x (quilt)'
     format = r'3\.\d+ \(quilt\)'
 
-    @classmethod
-    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
+    requires = ('orig_tar', 'debian_tar')
+    disallowed = ('debian_diff', 'native_tar')