summaryrefslogtreecommitdiffstats
path: root/pym/portage/util/__init__.py
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-09-13 11:40:22 -0700
committerZac Medico <zmedico@gentoo.org>2012-09-13 11:40:22 -0700
commit32dda00da1d9d33c345896119a7e01fc840df265 (patch)
tree18d304a5dede5b410f0a748dd61d134c866a48f2 /pym/portage/util/__init__.py
parent7fac4fd060dff7a5a6180f243176b2ddbb655133 (diff)
downloadportage-32dda00da1d9d33c345896119a7e01fc840df265.tar.gz
portage-32dda00da1d9d33c345896119a7e01fc840df265.tar.bz2
portage-32dda00da1d9d33c345896119a7e01fc840df265.zip
find_updated_config_files: x var name collision
This broke in commit 09de8dc47ec48af2276dfa098dd5e1d3d09ddbdd.
Diffstat (limited to 'pym/portage/util/__init__.py')
-rw-r--r--pym/portage/util/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py
index fee0bc7d2..e84958aa5 100644
--- a/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@ -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)