From: Mark Hymers Date: Thu, 5 Feb 2009 20:51:48 +0000 (+0000) Subject: remove backwards-compatiblity stuff which is no longer needed X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=250fb82d468dcd488cad753b7c624e5a6436a358;p=dak remove backwards-compatiblity stuff which is no longer needed Signed-off-by: Mark Hymers --- diff --git a/dak/check_archive.py b/dak/check_archive.py index 004fcddd..2eb450bd 100755 --- a/dak/check_archive.py +++ b/dak/check_archive.py @@ -218,20 +218,18 @@ def check_checksums(): utils.warn("**WARNING** md5sum mismatch for '%s' ('%s' [current] vs. '%s' [db])." % (filename, md5sum, db_md5sum)) if size != db_size: utils.warn("**WARNING** size mismatch for '%s' ('%s' [current] vs. '%s' [db])." % (filename, size, db_size)) - # Until the main database is filled, we need to not spit 500,000 warnings - # every time we scan the archive. Yet another hack (TM) which can go away - # once this is all working - if db_sha1sum is not None and db_sha1sum != '': - f.seek(0) - sha1sum = apt_pkg.sha1sum(f) - if sha1sum != db_sha1sum: - utils.warn("**WARNING** sha1sum mismatch for '%s' ('%s' [current] vs. '%s' [db])." % (filename, sha1sum, db_sha1sum)) - if db_sha256sum is not None and db_sha256sum != '': - f.seek(0) - sha256sum = apt_pkg.sha256sum(f) - if sha256sum != db_sha256sum: - utils.warn("**WARNING** sha256sum mismatch for '%s' ('%s' [current] vs. '%s' [db])." % (filename, sha256sum, db_sha256sum)) + # Check the sha1sum + f.seek(0) + sha1sum = apt_pkg.sha1sum(f) + if sha1sum != db_sha1sum: + utils.warn("**WARNING** sha1sum mismatch for '%s' ('%s' [current] vs. '%s' [db])." % (filename, sha1sum, db_sha1sum)) + + # Check the sha256sum + f.seek(0) + sha256sum = apt_pkg.sha256sum(f) + if sha256sum != db_sha256sum: + utils.warn("**WARNING** sha256sum mismatch for '%s' ('%s' [current] vs. '%s' [db])." % (filename, sha256sum, db_sha256sum)) print "Done."