From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 22 Feb 2007 20:54:17 +0000 (-0000)
Subject: Fix "NameError: global name 'myfilelist' is not defined" when collision-protect is... 
X-Git-Tag: v2.2_pre1~1663
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=89b3d4bdb0293f4a16554970961756ec2f62f3f6;p=portage.git

Fix "NameError: global name 'myfilelist' is not defined" when collision-protect is enabled.

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index ed08dbfd6..ec4c2db33 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1286,8 +1286,8 @@ class dblink(object):
 
 			collisions = []
 
-			print green("*")+" checking "+str(len(myfilelist))+" files for package collisions"
-			for f in myfilelist:
+			print green("*")+" checking "+str(len(mycontents))+" files for package collisions"
+			for f in mycontents:
 				nocheck = False
 				# listdir isn't intelligent enough to exclude symlinked dirs,
 				# so we have to do it ourself