* [gentoo-commits] portage r14058 - in main/trunk/pym/portage: . dbapi
@ 2009-08-15 0:15 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2009-08-15 0:15 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2009-08-15 00:15:11 +0000 (Sat, 15 Aug 2009)
New Revision: 14058
Modified:
main/trunk/pym/portage/checksum.py
main/trunk/pym/portage/dbapi/vartree.py
Log:
Fix dblink._unmerge_pkgfiles() to use the correct version of perform_md5
when it falls back to utf8 encoding.
Modified: main/trunk/pym/portage/checksum.py
===================================================================
--- main/trunk/pym/portage/checksum.py 2009-08-14 23:54:45 UTC (rev 14057)
+++ main/trunk/pym/portage/checksum.py 2009-08-15 00:15:11 UTC (rev 14058)
@@ -6,6 +6,7 @@
import portage
from portage.const import PRIVATE_PATH,PRELINK_BINARY,HASHING_BLOCKSIZE
from portage import os
+from portage import _fs_encoding
from portage import _merge_encoding
from portage import _unicode_encode
import errno
@@ -233,7 +234,8 @@
if hashname not in hashfunc_map:
raise portage.exception.DigestException(hashname + \
" hash function not available (needs dev-python/pycrypto)")
- myhash, mysize = hashfunc_map[hashname](myfilename)
+ myhash, mysize = hashfunc_map[hashname](_unicode_encode(myfilename,
+ encoding=_fs_encoding, errors='strict'))
except (OSError, IOError), e:
if e.errno == errno.ENOENT:
raise portage.exception.FileNotFound(myfilename)
Modified: main/trunk/pym/portage/dbapi/vartree.py
===================================================================
--- main/trunk/pym/portage/dbapi/vartree.py 2009-08-14 23:54:45 UTC (rev 14057)
+++ main/trunk/pym/portage/dbapi/vartree.py 2009-08-15 00:15:11 UTC (rev 14058)
@@ -2288,6 +2288,7 @@
"""
os = _os_merge
+ perf_md5 = perform_md5
showMessage = self._display_merge
scheduler = self._scheduler
@@ -2391,6 +2392,7 @@
pass
else:
os = portage.os
+ perf_md5 = portage.checksum.perform_md5
file_data = pkgfiles[objkey]
file_type = file_data[0]
@@ -2481,7 +2483,7 @@
continue
mymd5 = None
try:
- mymd5 = perform_md5(obj, calc_prelink=1)
+ mymd5 = perf_md5(obj, calc_prelink=1)
except FileNotFound, e:
# the file has disappeared between now and our stat call
show_unmerge("---", unmerge_desc["!obj"], file_type, obj)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-08-15 0:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-15 0:15 [gentoo-commits] portage r14058 - in main/trunk/pym/portage: . dbapi Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox