diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-12-28 21:40:20 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-12-28 21:40:20 +0000 |
| commit | 57d82741a131ed5c3a52d38f7d09548fbfecc323 (patch) | |
| tree | 6ac8f145a402e565cbd891731acf6f905d1d373c | |
| parent | 8d7572d440fc10f80271c4c6ad7795b9d8ad352a (diff) | |
| download | portage-57d82741a131ed5c3a52d38f7d09548fbfecc323.tar.gz portage-57d82741a131ed5c3a52d38f7d09548fbfecc323.tar.bz2 portage-57d82741a131ed5c3a52d38f7d09548fbfecc323.zip | |
For bug #159295 and python-2.3 compatibility, don't assume that dict.update can use an iterable.
svn path=/main/trunk/; revision=5409
| -rw-r--r-- | pym/portage.py | 3 |
1 files changed, 2 insertions, 1 deletions
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 |