Merge remote-tracking branch 'jcristau/by-hash-v5'

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index 809762264532ab4f47517d49e02f3f3e77af4024..2c88030c5f5a80fae91f64c11f6962d805f79c82 100755 (executable)
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -31,14 +31,6 @@ from daklib.gpg import SignedFile
 from daklib import utils
 from daklib.regexes import re_html_escaping, html_escaping
 
-################################################################################
-### work around bug #487902 in debian-python 0.1.10
-deb822.Changes._multivalued_fields = {
-            "files": [ "md5sum", "size", "section", "priority", "name" ],
-            "checksums-sha1": ["sha1", "size", "name"],
-            "checksums-sha256": ["sha256", "size", "name"],
-          }
-
 ################################################################################
 
 row_number = 1

diff --git a/daklib/utils.py b/daklib/utils.py
index 206ee0b89abcaf7ee2cdb67ecebdd70aa1a4e02d..6e7fc06992fb3ad23ee136371fc47bff59d33e79 100644 (file)
--- 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.