From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 4 Jul 2009 20:33:46 +0000 (-0000)
Subject: Make dblink.setfile() write environment.bz2 in binary mode.
X-Git-Tag: v2.2_rc34~76
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3461525778122bc4190107c5be4bbe2d09ca9e5c;p=portage.git

Make dblink.setfile() write environment.bz2 in binary mode.

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 5b6f54a6a..a5b39e317 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -4017,7 +4017,10 @@ class dblink(object):
 		return mydata
 
 	def setfile(self,fname,data):
-		write_atomic(os.path.join(self.dbdir, fname), data)
+		mode = 'w'
+		if fname == 'environment.bz2' or not isinstance(data, basestring):
+			mode = 'wb'
+		write_atomic(os.path.join(self.dbdir, fname), data, mode=mode)
 
 	def getelements(self,ename):
 		if not os.path.exists(self.dbdir+"/"+ename):