mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-24 23:21:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix minor style nits missed in initial checkin of check_deps

Browse Source 
Review URL: http://codereview.chromium.org/661415
This commit is contained in:
David James 2010-03-03 11:23:44 -08:00
parent 8e3af0243c
commit fe6426c692
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
check_deps
View File

@ -23,9 +23,9 @@ class CheckDependencies(object):
verbose: Print helpful messages. verbose: Print helpful messages.
""" """
self.root_ = root self._root = root
self.libcache_ = set() self._libcache = set()
self.verbose_ = verbose self._verbose = verbose
# Insert some default directories into our library cache. # Insert some default directories into our library cache.
# The /usr/lib/nss and /usr/lib/nspr directories are # The /usr/lib/nss and /usr/lib/nspr directories are
@ -35,7 +35,7 @@ class CheckDependencies(object):
"%s/usr/lib" % root, "%s/usr/lib" % root,
"%s/usr/lib/nss" % root, "%s/usr/lib/nss" % root,
"%s/usr/lib/nspr" % root "%s/usr/lib/nspr" % root
], self.libcache_) ], self._libcache)
def _ReadLibs(self, paths, libcache): def _ReadLibs(self, paths, libcache):
for path in paths: for path in paths:
@ -63,7 +63,7 @@ class CheckDependencies(object):
m = _RPATH_RE.search(line) m = _RPATH_RE.search(line)
if m: if m:
for path in m.group(1).split(":"): for path in m.group(1).split(":"):
rpaths.add(os.path.join(self.root_, path[1:])) rpaths.add(os.path.join(self._root, path[1:]))
f.close() f.close()
return (deps, rpaths) return (deps, rpaths)
@ -75,24 +75,24 @@ class CheckDependencies(object):
deps, rpaths = self._ReadDependencies(binary) deps, rpaths = self._ReadDependencies(binary)
if self.verbose_: if self._verbose:
for lib in self.libcache_ & deps: for lib in self._libcache & deps:
print "Found %s" % lib print "Found %s" % lib
for lib in deps - self.libcache_: for lib in deps - self._libcache:
if lib[0] != "/": if lib[0] != "/":
for path in rpaths: for path in rpaths:
if os.path.exists(os.path.join(path, lib)): if os.path.exists(os.path.join(path, lib)):
if self.verbose_: if self._verbose:
print "Found %s" % lib print "Found %s" % lib
break break
else: else:
print >>sys.stderr, "Problem with %s: Can't find %s" % (binary, lib) print >>sys.stderr, "Problem with %s: Can't find %s" % (binary, lib)
good = False good = False
else: else:
full_path = os.path.join(self.root_, lib[1:]) full_path = os.path.join(self._root, lib[1:])
if os.path.exists(full_path): if os.path.exists(full_path):
if self.verbose_: print "Found %s" % lib if self._verbose: print "Found %s" % lib
else: else:
print >>sys.stderr, "Problem with %s: Can't find %s" % (binary, lib) print >>sys.stderr, "Problem with %s: Can't find %s" % (binary, lib)
good = False good = False
@ -101,7 +101,6 @@ class CheckDependencies(object):
def main(): def main():
if len(sys.argv) < 3: if len(sys.argv) < 3:
print "Usage: %s [-v] sysroot binary [ binary ... ]" % sys.argv[0] print "Usage: %s [-v] sysroot binary [ binary ... ]" % sys.argv[0]
sys.exit(1) sys.exit(1)