X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fsrcformats.py;h=e454e2bd444e900a8b47ff8b786f65aeba2ad80d;hb=9dd35112e98631a7e367d2dd6cc3b05ba1a4ea3a;hp=90459ef35a95562f9f7dc61d5c068779adfd6c93;hpb=1a284d1ef8fd7e6029c506c470375ec2acc770bd;p=dak.git

diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index 90459ef3..e454e2bd 100644
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -19,12 +19,12 @@ class FormatOne(object):
     format = r'1.0'
 
     @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:
+        if (has['orig_tar_gz'] != has['orig_tar']) or \
+           (has['native_tar_gz'] != has['native_tar']) or \
+           has['debian_tar'] or has['more_orig_tar']:
             yield "contains source files not allowed in format %s" % cls.name
 
 class FormatThree(object):
@@ -34,10 +34,10 @@ class FormatThree(object):
     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:
+    def reject_msgs(cls, has):
+        if not has['native_tar']:
             yield "lack of required files for format %s" % cls.name
-        if orig_tar or debian_diff or debian_tar or more_orig_tar:
+        if has['orig_tar'] or has['debian_diff'] or has['debian_tar'] or has['more_orig_tar']:
             yield "contains source files not allowed in format %s" % cls.name
 
 class FormatThreeQuilt(object):
@@ -47,8 +47,8 @@ class FormatThreeQuilt(object):
     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):
+    def reject_msgs(cls, has):
+        if not (has['orig_tar'] and has['debian_tar']):
             yield "lack of required files for format %s" % cls.name
-        if debian_diff or native_tar:
+        if has['debian_diff'] or has['native_tar']:
             yield "contains source files not allowed in format %s" % cls.name