From 0943d0d301640fe376bfdda74982672794f549d9 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sun, 10 Aug 2008 09:33:08 +0000 Subject: [PATCH] Merged from trunk -r11371:11372 | 11372 | Don't use "dir" for a variable name since it's also a | | zmedico | builtin. | svn path=/main/branches/prefix/; revision=11389 --- pym/portage/dbapi/vartree.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 90ff6d747..e58bb6c82 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). -- 2.26.2