X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fsrcformats.py;h=d2829f5b3070ee94479faf3752f8df06175292e3;hb=7c5adcf962fe99d6a42307595f263f47d0112fbc;hp=d6079a0f5df6a9067445b5d366d4a4e51865b5ac;hpb=6fc48cd38c62a3132c8bd2a465d80b0b6fcac74f;p=dak.git

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index d6079a0f..d2829f5b 100644
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -1,10 +1,55 @@
+#!/usr/bin/python
+
+""" Helper functions for the various source formats
+
+@contact: Debian FTPMaster <ftpmaster@debian.org>
+@copyright: 2009, 2010  Joerg Jaspert <joerg@debian.org>
+@copyright: 2009  Chris Lamb <lamby@debian.org>
+@license: GNU General Public License version 2 or later
+"""
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+################################################################################
+
+# <sgran> hey, I think something's wrong with your git repo
+# <sgran> when I git pulled this last time, I got something that looked almost
+#         like python instead of dak
+# <mhy> sgran: slander
+# <sgran> sorry, I take it back, I've had a better look now
+
+################################################################################
 import re
 
-from regexes import re_verwithext
 from dak_exceptions import UnknownFormatError
 
 srcformats = []
 
+def get_format_from_string(txt):
+    """
+    Returns the SourceFormat class that corresponds to the specified .changes
+    Format value. If the string does not match any class, UnknownFormatError
+    is raised.
+    """
+
+    for format in srcformats:
+        if format.re_format.match(txt):
+            return format
+
+    raise UnknownFormatError("Unknown format %r" % txt)
+
 class SourceFormat(type):
     def __new__(cls, name, bases, attrs):
         klass = super(SourceFormat, cls).__new__(cls, name, bases, attrs)
@@ -27,39 +72,11 @@ 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:
-            # format = (0,0) are missing format headers of which we still
-            # have some in the archive.
-            if format != (1,0) and format != (0,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
 
     name = '1.0'
-    format = r'1.0'
+    format = r'1\.0'
 
     requires = ()
     disallowed = ('debian_tar', 'more_orig_tar')
@@ -71,7 +88,8 @@ class FormatOne(SourceFormat):
         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']):
+           (has['native_tar_gz'] != has['native_tar']) or \
+           has['orig_tar_sig']:
             yield "contains source files not allowed in format %s" % cls.name
 
         for msg in super(FormatOne, cls).reject_msgs(has):