Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/
Date: Sun, 02 Oct 2011 06:32:13
Message-Id: a1ed3230d6a121fb2bccc0a1d51255cae382ed4f.zmedico@gentoo
1 commit: a1ed3230d6a121fb2bccc0a1d51255cae382ed4f
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 2 06:31:52 2011 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 2 06:31:52 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=a1ed3230
7
8 checksum.py: use fchksum.fmd5t directly
9
10 ---
11 pym/portage/checksum.py | 5 +----
12 1 files changed, 1 insertions(+), 4 deletions(-)
13
14 diff --git a/pym/portage/checksum.py b/pym/portage/checksum.py
15 index 080a6df..9f3d81c 100644
16 --- a/pym/portage/checksum.py
17 +++ b/pym/portage/checksum.py
18 @@ -133,10 +133,7 @@ if "WHIRLPOOL" not in hashfunc_map:
19
20 # Use python-fchksum if available, prefer it over all other MD5 implementations
21 try:
22 - import fchksum
23 -
24 - def md5hash(filename):
25 - return fchksum.fmd5t(filename)
26 + from fchksum import fmd5t as md5hash
27 hashfunc_map["MD5"] = md5hash
28 hashorigin_map["MD5"] = "python-fchksum"