For bug #159295 and python-2.3 compatibility, don't assume that dict.update can use...
authorZac Medico <zmedico@gentoo.org>
Thu, 28 Dec 2006 21:40:20 +0000 (21:40 -0000)
committerZac Medico <zmedico@gentoo.org>
Thu, 28 Dec 2006 21:40:20 +0000 (21:40 -0000)
svn path=/main/trunk/; revision=5409

pym/portage.py

index 057c3e11db36c2805d5a5fc7384eafdb03d8d25d..2a1635080cc4c3f7dda63abaaa4b697b54cb65aa 100644 (file)
@@ -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