Merge remote-tracking branch 'jcristau/formatone-no-tar-sig'

[dak.git] / daklib / srcformats.py

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
old mode 100755 (executable)
new mode 100644 (file)
index 050691f..d2829f5
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -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):