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 0e3706e81fa3afb134a12a2399cf25f4c1a9b35d..f837966bcf5672143d28b68dbdda489e388ef95c 100644 (file)
--- 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 6ed7da433c383f80586fd6a90fa75273d6f8e315..2a36c82f9bd4537079fca30e2e117e7ef1a8358c 100644 (file)
--- 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