X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fsrcformats.py;h=d2829f5b3070ee94479faf3752f8df06175292e3;hb=HEAD;hp=85ac701fe38bad3a07c794569bfcb3af019f455d;hpb=f0bfd37e7286156598d79b53501ebe2000bb7924;p=dak.git diff --git a/daklib/srcformats.py b/daklib/srcformats.py old mode 100755 new mode 100644 index 85ac701f..d2829f5b --- a/daklib/srcformats.py +++ b/daklib/srcformats.py @@ -48,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): @@ -76,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') @@ -88,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):