On 10/01/2011 02:41 AM, Brian Harring wrote: > On Sat, Oct 01, 2011 at 07:40:52AM +0000, Robin H. Johnson wrote: >> From: "Robin H. Johnson" <robb...@gentoo.org> >> >> Provide public-domain implementation of the Whirlpool hash algorithm to >> be used as new Manifest2 hash. >> >> Signed-off-by: Robin H. Johnson <robb...@gentoo.org> >> --- >> pym/portage/checksum.py | 8 ++++++-- >> 1 files changed, 6 insertions(+), 2 deletions(-) >> >> diff --git a/pym/portage/checksum.py b/pym/portage/checksum.py >> index e5455fa..3593686 100644 >> --- a/pym/portage/checksum.py >> +++ b/pym/portage/checksum.py >> @@ -71,6 +71,10 @@ except ImportError: >> >> sha1hash = _generate_hash_function("SHA1", _new_sha1, origin="internal") >> >> +# Bundled WHIRLPOOL implementation >> +from portage.util.whirlpool import new as _new_whirlpool >> +whirlpoolhash = _generate_hash_function("WHIRLPOOL", _new_whirlpool, >> origin="bundled") >> + > > Likely should shift this to a trailing check if no whirlpool > implementation was found; via this, we can avoid the import unless > it's needed. > ~brian
Thanks, that's done now: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=06ad8911b5790a2ed963fe1b981751ab0a2be8d5 -- Thanks, Zac