From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 2 Mar 2010 18:26:05 +0000 (-0000)
Subject: Fix code from r15278 for python3 unicode compatibility. (trunk r15280)
X-Git-Tag: v2.1.8~203
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e9ab502d9806a227ebcc967e46718435e64a96bc;p=portage.git

Fix code from r15278 for python3 unicode compatibility. (trunk r15280)

svn path=/main/branches/2.1.7/; revision=15519
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 56694a348..990c6e020 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -3434,8 +3434,9 @@ def tar_contents(contents, root, tar, protect=None, onProgress=None):
 				# Create an empty file as a place holder in order to avoid
 				# potential collision-protect issues.
 				f = tempfile.TemporaryFile()
-				f.write("# empty file because --include-config=n " + \
-					"when `quickpkg` was used\n")
+				f.write(_unicode_encode(
+					"# empty file because --include-config=n " + \
+					"when `quickpkg` was used\n"))
 				f.flush()
 				f.seek(0)
 				tarinfo.size = os.fstat(f.fileno()).st_size