X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=daklib%2Futils.py;h=5e9c9b94617d3ff39722f2b7533c72a90846e3e7;hp=206ee0b89abcaf7ee2cdb67ecebdd70aa1a4e02d;hb=ac7962e07a871d2619b475c54f6be2b3a79616ee;hpb=2e2d8e7081496b3214a31a8dc1d85f8b84dff6a8

diff --git a/daklib/utils.py b/daklib/utils.py
index 206ee0b8..5e9c9b94 100644
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -72,10 +72,6 @@ default_config = "/etc/dak/dak.conf"     #: default dak config, defines host pro
 alias_cache = None        #: Cache for email alias checks
 key_uid_email_cache = {}  #: Cache for email addresses from gpg key uids
 
-# (hashname, function, earliest_changes_version)
-known_hashes = [("sha1", apt_pkg.sha1sum, (1, 8)),
-                ("sha256", apt_pkg.sha256sum, (1, 8))] #: hashes we accept for entries in .changes/.dsc
-
 # Monkeypatch commands.getstatusoutput as it may not return the correct exit
 # code in lenny's Python. This also affects commands.getoutput and
 # commands.getstatus.
@@ -311,11 +307,11 @@ def check_dsc_files(dsc_filename, dsc, dsc_files):
     has = defaultdict(lambda: 0)
 
     ftype_lookup = (
+        (r'orig\.tar\.(gz|bz2|xz)\.asc', ('orig_tar_sig',)),
         (r'orig\.tar\.gz',             ('orig_tar_gz', 'orig_tar')),
         (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)\.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)\.asc', ('more_orig_tar_sig',)),