X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fsrcformats.py;h=accccae6376fb0e6e57279d8500164d27eb6aee1;hb=391f5ec09a119131dc846b796ca791f4cecc69e4;hp=0b6b715a7c858b1a17ab425a52b488176a79db1b;hpb=6560a55727d338e41c14f11ba96d5bc86b210080;p=dak.git

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index 0b6b715a..accccae6 100644
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -1,50 +1,113 @@
+#!/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 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)
         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
 
-    format = r'1.0'
+    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:
-            yield "contains source files not allowed in format 1.0"
+        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
+
+        for msg in super(FormatOne, cls).reject_msgs(has):
+            yield msg
 
-class FormatThree(object):
+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 3.x (native)."
-        if orig_tar or debian_diff or debian_tar or more_orig_tar:
-            yield "contains source files not allowed in format '3.x (native)'"
+    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 '3.x (quilt)'."
-        if debian_diff or native_tar:
-            yield "contains source files not allowed in format 3.x (quilt)"
+    requires = ('orig_tar', 'debian_tar')
+    disallowed = ('debian_diff', 'native_tar')