X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=206ee0b89abcaf7ee2cdb67ecebdd70aa1a4e02d;hb=391f5ec09a119131dc846b796ca791f4cecc69e4;hp=1b878e22d9853eb500cff06c428889533afdd1d5;hpb=f8627994eb4fa14735d53ea4801a08aeef06f635;p=dak.git

diff --git a/daklib/utils.py b/daklib/utils.py
index 1b878e22..206ee0b8 100644
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -315,11 +315,11 @@ def check_dsc_files(dsc_filename, dsc, dsc_files):
         (r'diff\.gz',                  ('debian_diff',)),
         (r'tar\.gz',                   ('native_tar_gz', 'native_tar')),
         (r'debian\.tar\.(gz|bz2|xz)',  ('debian_tar',)),
-        (r'orig\.tar\.(gz|bz2|xz)',    ('orig_tar',)),
         (r'orig\.tar\.(gz|bz2|xz)\.asc', ('orig_tar_sig',)),
+        (r'orig\.tar\.(gz|bz2|xz)',    ('orig_tar',)),
         (r'tar\.(gz|bz2|xz)',          ('native_tar',)),
-        (r'orig-.+\.tar\.(gz|bz2|xz)', ('more_orig_tar',)),
         (r'orig-.+\.tar\.(gz|bz2|xz)\.asc', ('more_orig_tar_sig',)),
+        (r'orig-.+\.tar\.(gz|bz2|xz)', ('more_orig_tar',)),
     )
 
     for f in dsc_files:
@@ -340,7 +340,8 @@ def check_dsc_files(dsc_filename, dsc, dsc_files):
 
         # File does not match anything in lookup table; reject
         if not matched:
-            reject("%s: unexpected source file '%s'" % (dsc_filename, f))
+            rejmsg.append("%s: unexpected source file '%s'" % (dsc_filename, f))
+            break
 
     # Check for multiple files
     for file_type in ('orig_tar', 'orig_tar_sig', 'native_tar', 'debian_tar', 'debian_diff'):