From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 28 Dec 2006 21:40:20 +0000 (-0000)
Subject: For bug #159295 and python-2.3 compatibility, don't assume that dict.update can use... 
X-Git-Tag: v2.1.2~203
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=57d82741a131ed5c3a52d38f7d09548fbfecc323;p=portage.git

For bug #159295 and python-2.3 compatibility, don't assume that dict.update can use an iterable.

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

diff --git a/pym/portage.py b/pym/portage.py
index 057c3e11d..2a1635080 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -3283,7 +3283,8 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
 				os.close(pr)
 				mybytes = "".join(mybytes)
 				global auxdbkeys
-				dbkey.update(izip(auxdbkeys, mybytes.split("\n")))
+				for k, v in izip(auxdbkeys, mybytes.splitlines()):
+					dbkey[k] = v
 				retval = os.waitpid(mypids[0], 0)[1]
 				# If it got a signal, return the signal that was sent, but
 				# shift in order to distinguish it from a return value. (just