summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Mauch <genone@gentoo.org>2006-01-08 01:57:26 +0000
committerMarius Mauch <genone@gentoo.org>2006-01-08 01:57:26 +0000
commit4c7cee64fa40301a2352340b68c7e2ef46c594a1 (patch)
treece96e9d921a9ea03b9e7cc30a3a8130b82c6d530
parent47f119c14529901844f08fb956f6921056e5545a (diff)
downloadportage-4c7cee64fa40301a2352340b68c7e2ef46c594a1.tar.gz
portage-4c7cee64fa40301a2352340b68c7e2ef46c594a1.tar.bz2
portage-4c7cee64fa40301a2352340b68c7e2ef46c594a1.zip
reenable multi-hash and make error message a bit more useful
svn path=/main/trunk/; revision=2544
-rw-r--r--pym/portage_checksum.py2
-rw-r--r--pym/portage_const.py3
2 files changed, 2 insertions, 3 deletions
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