X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fsrcformats.py;h=60da5bc0d7305e92a4e3b8c968caf2a247e0c99e;hb=4587ac614fbf2fcdb97cdf2752da2c3ce25c7398;hp=a8237c3d5e17e9cded9a24daa2d42d890146e768;hpb=7a22fcc70b41ee02adeb5bf18c9d1d0d91917615;p=dak.git

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index a8237c3d..60da5bc0 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):
@@ -24,6 +27,32 @@ class SourceFormat(type):
             if has[key]:
                 yield "contains source files not allowed in format %s" % cls.name
 
+    @classmethod
+    def parse_format(cls, txt, is_a_dsc=False, field='files'):
+        format = re_verwithext.search(txt)
+        if not format:
+            raise UnknownFormatError, txt
+
+        format = format.groups()
+        if format[1] == None:
+            format = int(float(format[0])), 0, format[2]
+        else:
+            format = int(format[0]), int(format[1]), format[2]
+        if format[2] == None:
+            format = format[:2]
+
+        if is_a_dsc:
+            if format != (1,0) and \
+               format != (3,0,"quilt") and format != (3,0,"native"):
+                raise UnknownFormatError, txt
+        else:
+            if (format < (1,5) or format > (1,8)):
+                raise UnknownFormatError, txt
+            if field != "files" and format < (1,8):
+                raise UnknownFormatError, txt
+
+        return format
+
 class FormatOne(SourceFormat):
     __metaclass__ = SourceFormat
 
@@ -37,6 +66,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