From 96afdded6d5cdcb8b43f5d49907cadd7af181c88 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 14 Aug 2009 08:19:59 +0000 Subject: Use portage._merge_encoding to encode/decode all filenames during merge/unmerge operations. svn path=/main/trunk/; revision=14027 --- pym/portage/checksum.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pym/portage/checksum.py') diff --git a/pym/portage/checksum.py b/pym/portage/checksum.py index 501ae3e6a..5def1ac8a 100644 --- a/pym/portage/checksum.py +++ b/pym/portage/checksum.py @@ -6,6 +6,7 @@ import portage from portage.const import PRIVATE_PATH,PRELINK_BINARY,HASHING_BLOCKSIZE from portage import os +from portage import _merge_encoding from portage import _unicode_encode import errno import stat @@ -117,6 +118,9 @@ if os.path.exists(PRELINK_BINARY): def perform_md5(x, calc_prelink=0): return perform_checksum(x, "MD5", calc_prelink)[0] +def _perform_md5_merge(x, **kwargs): + return perform_md5(_unicode_encode(x, encoding=_merge_encoding), **kwargs) + def perform_all(x, calc_prelink=0): mydict = {} for k in hashfunc_map: -- cgit v1.2.3-1-g7c22