summaryrefslogtreecommitdiffstats
path: root/pym/portage/cache
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-08-21 04:46:31 +0000
committerZac Medico <zmedico@gentoo.org>2009-08-21 04:46:31 +0000
commit82f0c8c317c1d51a45589b708e476e7711a21da4 (patch)
treeace52bce4969f515901ca4fbde735071e3c28221 /pym/portage/cache
parent9078941af78c0fc7b885ad2779a4f8b73b3f1bd4 (diff)
downloadportage-82f0c8c317c1d51a45589b708e476e7711a21da4.tar.gz
portage-82f0c8c317c1d51a45589b708e476e7711a21da4.tar.bz2
portage-82f0c8c317c1d51a45589b708e476e7711a21da4.zip
Replace _content_encoding, _fs_encoding, and _merge_encoding with direct
usage of _encodings. svn path=/main/trunk/; revision=14113
Diffstat (limited to 'pym/portage/cache')
-rw-r--r--pym/portage/cache/ebuild_xattr.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage/cache/ebuild_xattr.py b/pym/portage/cache/ebuild_xattr.py
index bcaf30640..4406b4e77 100644
--- a/pym/portage/cache/ebuild_xattr.py
+++ b/pym/portage/cache/ebuild_xattr.py
@@ -10,7 +10,7 @@ from portage.cache import fs_template
from portage.versions import catsplit
from portage import cpv_getkey
from portage import os
-from portage import _fs_encoding
+from portage import _encoding
from portage import _unicode_decode
import xattr
from errno import ENODATA,ENOSPC,E2BIG
@@ -159,7 +159,7 @@ class database(fs_template.FsBased):
for file in files:
try:
file = _unicode_decode(file,
- encoding=_fs_encoding, errors='strict')
+ encoding=_encodings['fs'], errors='strict')
except UnicodeDecodeError:
continue
if file[-7:] == '.ebuild':