aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-08-24 01:27:20 +0000
committerZac Medico <zmedico@gentoo.org>2009-08-24 01:27:20 +0000
commit798c0ccee6086934d087e60d5ade55f67d2bfc5f (patch)
treea34597054e221b3fb2ae4a5891ea6a220663e8dd /pym/portage/xpak.py
parentBug #282306 - Inside dblink._match_contents(), fall back to utf_8 encoding if (diff)
downloadportage-798c0ccee6086934d087e60d5ade55f67d2bfc5f.tar.gz
portage-798c0ccee6086934d087e60d5ade55f67d2bfc5f.tar.bz2
portage-798c0ccee6086934d087e60d5ade55f67d2bfc5f.zip
Bug #282505 - Fix unicode handling for package moves in binary packages.v2.2_rc40
svn path=/main/trunk/; revision=14134
Diffstat (limited to 'pym/portage/xpak.py')
-rw-r--r--pym/portage/xpak.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/pym/portage/xpak.py b/pym/portage/xpak.py
index 5b08c0a3f..15a432f51 100644
--- a/pym/portage/xpak.py
+++ b/pym/portage/xpak.py
@@ -97,6 +97,17 @@ def xpak(rootdir,outfile=None):
def xpak_mem(mydata):
"""Create an xpack segement from a map object."""
+
+ mydata_encoded = {}
+ for k, v in mydata.iteritems():
+ k = _unicode_encode(k,
+ encoding=_encodings['repo.content'], errors='backslashreplace')
+ v = _unicode_encode(v,
+ encoding=_encodings['repo.content'], errors='backslashreplace')
+ mydata_encoded[k] = v
+ mydata = mydata_encoded
+ del mydata_encoded
+
indexglob = _unicode_encode('')
indexpos=0
dataglob = _unicode_encode('')