| 1 |
commit: eee5cda2c8be4957b8e2e5fe1cd1bb42e2d4edcf |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Mar 27 21:26:08 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 27 21:26:08 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=eee5cda2 |
| 7 |
|
| 8 |
dblink: rename 'buffer' var in _elog_process |
| 9 |
|
| 10 |
Avoid name collision with built-in 'buffer' function. |
| 11 |
|
| 12 |
--- |
| 13 |
pym/portage/dbapi/vartree.py | 10 +++++----- |
| 14 |
1 files changed, 5 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py |
| 17 |
index afcbdc9..e9b183e 100644 |
| 18 |
--- a/pym/portage/dbapi/vartree.py |
| 19 |
+++ b/pym/portage/dbapi/vartree.py |
| 20 |
@@ -2800,7 +2800,7 @@ class dblink(object): |
| 21 |
"QA": "eqawarn", |
| 22 |
"ERROR": "eerror" |
| 23 |
} |
| 24 |
- buffer = [] |
| 25 |
+ str_buffer = [] |
| 26 |
for phase, messages in logentries.items(): |
| 27 |
for key, lines in messages: |
| 28 |
funcname = funcnames[key] |
| 29 |
@@ -2808,10 +2808,10 @@ class dblink(object): |
| 30 |
lines = [lines] |
| 31 |
for line in lines: |
| 32 |
fields = (funcname, phase, cpv, line.rstrip('\n')) |
| 33 |
- buffer.append(' '.join(fields)) |
| 34 |
- buffer.append('\n') |
| 35 |
- if buffer: |
| 36 |
- os.write(self._pipe, _unicode_encode(''.join(buffer))) |
| 37 |
+ str_buffer.append(' '.join(fields)) |
| 38 |
+ str_buffer.append('\n') |
| 39 |
+ if str_buffer: |
| 40 |
+ os.write(self._pipe, _unicode_encode(''.join(str_buffer))) |
| 41 |
|
| 42 |
def treewalk(self, srcroot, destroot, inforoot, myebuild, cleanup=0, |
| 43 |
mydbapi=None, prev_mtimes=None): |
Archives