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

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index 7d7dd940..d2829f5b 100644
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -1,3 +1,36 @@
+#!/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
@@ -15,7 +48,7 @@ def get_format_from_string(txt):
         if format.re_format.match(txt):
             return format
 
-    raise UnknownFormatError, "Unknown format %r" % txt
+    raise UnknownFormatError("Unknown format %r" % txt)
 
 class SourceFormat(type):
     def __new__(cls, name, bases, attrs):
@@ -43,7 +76,7 @@ class FormatOne(SourceFormat):
     __metaclass__ = SourceFormat
 
     name = '1.0'
-    format = r'1.0'
+    format = r'1\.0'
 
     requires = ()
     disallowed = ('debian_tar', 'more_orig_tar')
@@ -55,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):