From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 2 Dec 2009 06:55:49 +0000 (-0000)
Subject: Bug #295351 - Make update_dbentries() return unicode if it's given unicode,
X-Git-Tag: v2.2_rc55~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f78430bc5056c29f195c6464cf54a07da26db997;p=portage.git

Bug #295351 - Make update_dbentries() return unicode if it's given unicode,
and bytes if it's given bytes.

svn path=/main/trunk/; revision=14921
---

diff --git a/pym/portage/update.py b/pym/portage/update.py
index c2f8f3006..04812d5a4 100644
--- a/pym/portage/update.py
+++ b/pym/portage/update.py
@@ -63,15 +63,19 @@ def update_dbentries(update_iter, mydata):
 		k_unicode = _unicode_decode(k,
 			encoding=_encodings['repo.content'], errors='replace')
 		if k_unicode not in ignored_dbentries:
+			orig_content = mycontent
 			mycontent = _unicode_decode(mycontent,
 				encoding=_encodings['repo.content'], errors='replace')
+			is_encoded = mycontent is not orig_content
 			orig_content = mycontent
 			for update_cmd in update_iter:
 				mycontent = update_dbentry(update_cmd, mycontent)
 			if mycontent != orig_content:
-				updated_items[k] = _unicode_encode(mycontent,
-					encoding=_encodings['repo.content'],
-					errors='backslashreplace')
+				if is_encoded:
+					mycontent = _unicode_encode(mycontent,
+						encoding=_encodings['repo.content'],
+						errors='backslashreplace')
+				updated_items[k] = mycontent
 	return updated_items
 
 def fixdbentries(update_iter, dbdir):