From: Marius Mauch <genone@gentoo.org>
Date: Sun, 8 Jan 2006 01:57:26 +0000 (-0000)
Subject: reenable multi-hash and make error message a bit more useful
X-Git-Tag: v2.1_pre4~46
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4c7cee64fa40301a2352340b68c7e2ef46c594a1;p=portage.git

reenable multi-hash and make error message a bit more useful

svn path=/main/trunk/; revision=2544
---

diff --git a/pym/portage_checksum.py b/pym/portage_checksum.py
index 0e3706e81..f837966bc 100644
--- a/pym/portage_checksum.py
+++ b/pym/portage_checksum.py
@@ -144,6 +144,6 @@ def perform_multiple_checksums(filename, hashes=["MD5"], calc_prelink=0):
 	rVal = {}
 	for x in hashes:
 		if x not in hashfunc_map:
-			raise portage_exception.DigestException, x+" hash function not available"
+			raise portage_exception.DigestException, x+" hash function not available (needs dev-python/pycrypto)"
 		rVal[x] = perform_checksum(filename, hashfunc_map[x], calc_prelink)[0]
 	return rVal
diff --git a/pym/portage_const.py b/pym/portage_const.py
index 6ed7da433..2a36c82f9 100644
--- a/pym/portage_const.py
+++ b/pym/portage_const.py
@@ -48,8 +48,7 @@ EAPI = 0
 HASHING_BLOCKSIZE		= 32768
 # Disabling until behaviour when missing the relevant python module is
 # corrected.  #116485
-#MANIFEST1_HASH_FUNCTIONS = ["MD5","SHA256","RMD160"]
-MANIFEST1_HASH_FUNCTIONS = ["MD5"]
+MANIFEST1_HASH_FUNCTIONS = ["MD5","SHA256","RMD160"]
 
 # ===========================================================================
 # END OF CONSTANTS -- END OF CONSTANTS -- END OF CONSTANTS -- END OF CONSTANT