From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 6 Apr 2008 23:33:43 +0000 (-0000)
Subject: Fix variable name collision in DepcheckCompositeDB.match().
X-Git-Tag: v2.2_pre6~233
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=78cddb0159e25305d316cde0f882b3e12aa7d055;p=portage.git

Fix variable name collision in DepcheckCompositeDB.match().

svn path=/main/trunk/; revision=9736
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index a59acd51d..fd1304b6a 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1446,8 +1446,8 @@ class DepcheckCompositeDB(object):
 					arg_atoms = list(self._depgraph._iter_atoms_for_pkg(pkg))
 				except portage.exception.InvalidDependString:
 					arg_atoms = []
-				for arg, atom in arg_atoms:
-					arg_cp = portage.dep_getkey(atom)
+				for arg, arg_atom in arg_atoms:
+					arg_cp = portage.dep_getkey(arg_atom)
 					if arg and arg_cp != pkg.cp:
 						# If this argument matches via PROVIDE but there is a
 						# new-style virtual available, then the argument does