From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 13 Sep 2012 18:40:22 +0000 (-0700)
Subject: find_updated_config_files: x var name collision
X-Git-Tag: v2.2.0_alpha128~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=32dda00da1d9d33c345896119a7e01fc840df265;p=portage.git

find_updated_config_files: x var name collision

This broke in commit 09de8dc47ec48af2276dfa098dd5e1d3d09ddbdd.
---

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)