X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fsrcformats.py;h=2b07c7ef4f524021b21a033944df3a7be81653af;hb=c9ba1a13b41a4f21b72485d9d93008f4d16f71ac;hp=87ba2f89c614bd71c9903a4ff7d05a6ee379179b;hpb=b2d2d87ae436de26dacd15885c6e71309c869180;p=dak.git

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index 87ba2f89..2b07c7ef 100644
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -1,5 +1,8 @@
 import re
 
+from regexes import re_verwithext
+from dak_exceptions import UnknownFormatError
+
 srcformats = []
 
 class SourceFormat(type):
@@ -17,13 +20,44 @@ class SourceFormat(type):
 
     @classmethod
     def reject_msgs(cls, has):
-        if len(cls.required) != len([x for x in requires if has[x]]):
+        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
 
+    @classmethod
+    def parse_format(cls, txt):
+        format = re_verwithext.search(txt)
+
+        if format is None:
+            raise UnknownFormatError, txt
+
+        format = format.groups()
+
+        if format[1] is None:
+            format = int(float(format[0])), 0, format[2]
+        else:
+            format = int(format[0]), int(format[1]), format[2]
+
+        if format[2] is None:
+            format = format[:2]
+
+        return format
+
+    @classmethod
+    def validate_format(cls, format, is_a_dsc=False, field='files'):
+        if is_a_dsc:
+            if format != (1,0) and \
+               format != (3,0,"quilt") and format != (3,0,"native"):
+                raise UnknownFormatError, repr(format)
+        else:
+            if (format < (1,5) or format > (1,8)):
+                raise UnknownFormatError, repr(format)
+            if field != "files" and format < (1,8):
+                raise UnknownFormatError, repr(format)
+
 class FormatOne(SourceFormat):
     __metaclass__ = SourceFormat
 
@@ -37,6 +71,8 @@ class FormatOne(SourceFormat):
     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 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