From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from <gentoo-commits+bounces-330442-garchives=archives.gentoo.org@lists.gentoo.org>) id 1Q3xUT-0007XG-IR for garchives@archives.gentoo.org; Sun, 27 Mar 2011 21:27:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC2251C058; Sun, 27 Mar 2011 21:26:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 755DA1C058 for <gentoo-commits@lists.gentoo.org>; Sun, 27 Mar 2011 21:26:35 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 770B51B41B5 for <gentoo-commits@lists.gentoo.org>; Sun, 27 Mar 2011 21:26:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D5FC28006A for <gentoo-commits@lists.gentoo.org>; Sun, 27 Mar 2011 21:26:32 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org> Message-ID: <eee5cda2c8be4957b8e2e5fe1cd1bb42e2d4edcf.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: eee5cda2c8be4957b8e2e5fe1cd1bb42e2d4edcf Date: Sun, 27 Mar 2011 21:26:32 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 2f3cf8877d0a0d56635d9cf552b3da00 commit: eee5cda2c8be4957b8e2e5fe1cd1bb42e2d4edcf Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sun Mar 27 21:26:08 2011 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sun Mar 27 21:26:08 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Deee5cda2 dblink: rename 'buffer' var in _elog_process Avoid name collision with built-in 'buffer' function. --- pym/portage/dbapi/vartree.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index afcbdc9..e9b183e 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -2800,7 +2800,7 @@ class dblink(object): "QA": "eqawarn", "ERROR": "eerror" } - buffer =3D [] + str_buffer =3D [] for phase, messages in logentries.items(): for key, lines in messages: funcname =3D funcnames[key] @@ -2808,10 +2808,10 @@ class dblink(object): lines =3D [lines] for line in lines: fields =3D (funcname, phase, cpv, line.rstrip('\n')) - buffer.append(' '.join(fields)) - buffer.append('\n') - if buffer: - os.write(self._pipe, _unicode_encode(''.join(buffer))) + str_buffer.append(' '.join(fields)) + str_buffer.append('\n') + if str_buffer: + os.write(self._pipe, _unicode_encode(''.join(str_buffer))) =20 def treewalk(self, srcroot, destroot, inforoot, myebuild, cleanup=3D0, mydbapi=3DNone, prev_mtimes=3DNone):