dblink: rename 'buffer' var in _elog_process
authorZac Medico <zmedico@gentoo.org>
Sun, 27 Mar 2011 21:26:08 +0000 (14:26 -0700)
committerZac Medico <zmedico@gentoo.org>
Sun, 27 Mar 2011 21:26:08 +0000 (14:26 -0700)
Avoid name collision with built-in 'buffer' function.

pym/portage/dbapi/vartree.py

index afcbdc9d75d2717c51a12ae942f53120fc69f5bb..e9b183ec9bf18368233f5f879e9b6ac713b32fe1 100644 (file)
@@ -2800,7 +2800,7 @@ class dblink(object):
                                "QA": "eqawarn",
                                "ERROR": "eerror"
                        }
-                       buffer = []
+                       str_buffer = []
                        for phase, messages in logentries.items():
                                for key, lines in messages:
                                        funcname = funcnames[key]
@@ -2808,10 +2808,10 @@ class dblink(object):
                                                lines = [lines]
                                        for line in lines:
                                                fields = (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)))
 
        def treewalk(self, srcroot, destroot, inforoot, myebuild, cleanup=0,
                mydbapi=None, prev_mtimes=None):