summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-08-09 19:03:03 +0000
committerZac Medico <zmedico@gentoo.org>2008-08-09 19:03:03 +0000
commitd621ebe9d895d70451f82fd85179cb75e7de0fda (patch)
treebe3a450e60089a6e796d6768c14148b904347db8
parent617b11b0e92ab7b3e85bd7a1394c50d008470cc1 (diff)
downloadportage-d621ebe9d895d70451f82fd85179cb75e7de0fda.tar.gz
portage-d621ebe9d895d70451f82fd85179cb75e7de0fda.tar.bz2
portage-d621ebe9d895d70451f82fd85179cb75e7de0fda.zip
Don't use "dir" for a variable name since it's also a builtin.
svn path=/main/trunk/; revision=11372
-rw-r--r--pym/portage/dbapi/vartree.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 6b71ad7ae..0355de6ba 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -270,9 +270,9 @@ class LinkageMap(object):
# unnoticed. As a result of these cases, check that a file with
# the same name as the soname exists in obj's runpath.
path = self._obj_properties[obj][2] + self._defpath
- for dir in path:
+ for d in path:
cachedSoname, cachedRealpath, cachedExists = \
- cache.get(os.path.join(dir, soname))
+ cache.get(os.path.join(d, soname))
# Check that the this library provides the needed soname. Doing
# this, however, will cause consumers of libraries missing
# sonames to be unnecessarily emerged. (eg libmix.so)
@@ -280,13 +280,13 @@ class LinkageMap(object):
validLibraries.add(cachedRealpath)
if debug and cachedRealpath not in libraries:
print "Found provider outside of findProviders:", \
- os.path.join(dir, soname), "->", cachedRealpath
+ os.path.join(d, soname), "->", cachedRealpath
# A valid library has been found, so there is no need to
# continue.
break
if debug and cachedRealpath in self._obj_properties:
print "Broken symlink or missing/bad soname:", \
- os.path.join(dir, soname), '->', cachedRealpath, \
+ os.path.join(d, soname), '->', cachedRealpath, \
"with soname", cachedSoname, "but expecting", soname
# This conditional checks if there are no libraries to satisfy the
# soname (empty set).