summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-02-22 20:54:17 +0000
committerZac Medico <zmedico@gentoo.org>2007-02-22 20:54:17 +0000
commit89b3d4bdb0293f4a16554970961756ec2f62f3f6 (patch)
treed5df0da78277b54a986703c2974fdb8225f9e9e8
parent584edcc22102046a6289d3d91fd88afd0f299aa9 (diff)
downloadportage-89b3d4bdb0293f4a16554970961756ec2f62f3f6.tar.gz
portage-89b3d4bdb0293f4a16554970961756ec2f62f3f6.tar.bz2
portage-89b3d4bdb0293f4a16554970961756ec2f62f3f6.zip
Fix "NameError: global name 'myfilelist' is not defined" when collision-protect is enabled.
svn path=/main/trunk/; revision=6038
-rw-r--r--pym/portage/dbapi/vartree.py4
1 files changed, 2 insertions, 2 deletions
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