find_updated_config_files: x var name collision
authorZac Medico <zmedico@gentoo.org>
Thu, 13 Sep 2012 18:40:22 +0000 (11:40 -0700)
committerZac Medico <zmedico@gentoo.org>
Thu, 13 Sep 2012 18:40:22 +0000 (11:40 -0700)
This broke in commit 09de8dc47ec48af2276dfa098dd5e1d3d09ddbdd.

pym/portage/util/__init__.py

index fee0bc7d230dc648e7dea8c0b401de7c489054d1..e84958aa5107107b57f1e58fd65ca8abe6cf9cbb 100644 (file)
@@ -1624,8 +1624,8 @@ def find_updated_config_files(target_root, config_protect):
                        cmd = shlex_split(mycommand)
                        if sys.hexversion < 0x3000000 or sys.hexversion >= 0x3020000:
                                # Python 3.1 does not support bytes in Popen args.
-                               cmd = [_unicode_encode(x, encoding=encoding, errors='strict')
-                                       for x in cmd]
+                               cmd = [_unicode_encode(arg, encoding=encoding, errors='strict')
+                                       for arg in cmd]
                        proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
                                stderr=subprocess.STDOUT)
                        output = _unicode_decode(proc.communicate()[0], encoding=encoding)