zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Final flake8 changes

Browse Source
This commit is contained in:
Adam J. Stewart 2016-05-11 11:46:41 -05:00
parent 5879f8207f
commit c043275f1b
6 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/spack/spack/hooks/licensing.py
View File

@ -134,4 +134,3 @@ def symlink_license(pkg):
os.symlink(target, link_name) os.symlink(target, link_name)
tty.msg("Added local symlink %s to global license file" % tty.msg("Added local symlink %s to global license file" %
link_name) link_name)

8
lib/spack/spack/package.py
View File

@ -407,7 +407,6 @@ def global_license_file(self):
return join_path(global_license_dir, self.name, return join_path(global_license_dir, self.name,
os.path.basename(self.license_files[0])) os.path.basename(self.license_files[0]))
@property @property
def version(self): def version(self):
if not self.spec.versions.concrete: if not self.spec.versions.concrete:
@ -1021,7 +1020,6 @@ def check_paths(path_list, filetype, predicate):
raise InstallError( raise InstallError(
"Install failed for %s. Nothing was installed!" % self.name) "Install failed for %s. Nothing was installed!" % self.name)
def do_install_dependencies(self, **kwargs): def do_install_dependencies(self, **kwargs):
# Pass along paths of dependencies here # Pass along paths of dependencies here
for dep in self.spec.dependencies.values(): for dep in self.spec.dependencies.values():
@ -1349,11 +1347,9 @@ def fetch_remote_versions(self):
def rpath(self): def rpath(self):
"""Get the rpath this package links with, as a list of paths.""" """Get the rpath this package links with, as a list of paths."""
rpaths = [self.prefix.lib, self.prefix.lib64] rpaths = [self.prefix.lib, self.prefix.lib64]
rpaths.extend(d.prefix.lib rpaths.extend(d.prefix.lib for d in self.spec.traverse(root=False)
for d in self.spec.traverse(root=False)
if os.path.isdir(d.prefix.lib)) if os.path.isdir(d.prefix.lib))
rpaths.extend(d.prefix.lib64 rpaths.extend(d.prefix.lib64 for d in self.spec.traverse(root=False)
for d in self.spec.traverse(root=False)
if os.path.isdir(d.prefix.lib64)) if os.path.isdir(d.prefix.lib64))
return rpaths return rpaths