From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 24 Oct 2017 20:30:51 +0000 (+0100)
Subject: Drop calc_hash1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26d32ca8e66bc07a512266b590455b30b1cc3f03;p=pbs.git

Drop calc_hash1

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/buildservice/misc.py b/src/buildservice/misc.py
index 58089514..018e953e 100644
--- a/src/buildservice/misc.py
+++ b/src/buildservice/misc.py
@@ -92,11 +92,6 @@ def calc_hash(filename, algo="sha512"):
 
 	return h.hexdigest()
 
-def calc_hash1(filename):
-	# XXX COMPAT FUNCTION
-	# to be removed
-	return calc_hash(filename, "sha1")
-
 def guess_filetype(filename):
 	# XXX very cheap check. Need to do better here.
 	if tarfile.is_tarfile(filename):
diff --git a/src/buildservice/uploads.py b/src/buildservice/uploads.py
index af67b916..7c43aa54 100644
--- a/src/buildservice/uploads.py
+++ b/src/buildservice/uploads.py
@@ -139,7 +139,7 @@ class Upload(base.DataObject):
 			return False
 
 		# Calculate a hash to validate the upload.
-		hash = misc.calc_hash1(self.path)
+		hash = misc.calc_hash(self.path, "sha1")
 
 		if not self.hash == hash:
 			logging.error("Hash did not match: %s != %s" % (self.hash, hash))