From 922e7a0ae7c9d94ed24832ebd6f94153ffe7d66f Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 23 Feb 2007 13:23:22 +0000
Subject: Make verify_all() return an "insufficient data" error if there is not
 at least one supported hash type.

svn path=/main/trunk/; revision=6055
---
 pym/portage/checksum.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'pym/portage/checksum.py')

diff --git a/pym/portage/checksum.py b/pym/portage/checksum.py
index 1a96787ec..77c962526 100644
--- a/pym/portage/checksum.py
+++ b/pym/portage/checksum.py
@@ -3,6 +3,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+if not hasattr(__builtins__, "set"):
+	from sets import Set as set
 
 from portage.const import PRIVATE_PATH,PRELINK_BINARY,HASHING_BLOCKSIZE
 import os
@@ -113,6 +115,22 @@ def verify_all(filename, mydict, calc_prelink=0, strict=0):
 		if e.errno == errno.ENOENT:
 			raise portage.exception.FileNotFound(filename)
 		return False, (str(e), None, None)
+
+	verifiable_hash_types = set(mydict).intersection(hashfunc_map)
+	verifiable_hash_types.discard("size")
+	if not verifiable_hash_types:
+		expected = set(hashfunc_map)
+		expected.discard("size")
+		expected = list(expected)
+		expected.sort()
+		expected = " ".join(expected)
+		got = set(mydict)
+		got.discard("size")
+		got = list(got)
+		got.sort()
+		got = " ".join(got)
+		return False, ("Insufficient data for checksum verification", got, expected)
+
 	for x in mydict.keys():
 		if   x == "size":
 			continue
-- 
cgit v1.2.3-1-g7c22