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

Fix flake8 errors

Browse Source
This commit is contained in:
Carson Woods
2020-07-15 13:44:30 -04:00
parent dce7be9932
commit 188a371595
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/spack/spack/modules/common.py
View File

@@ -218,16 +218,16 @@ def root_path(name):
# Root folders where the various module files should be written # Root folders where the various module files should be written
active_upstream = spack.config.get('config:active_upstream') active_upstream = spack.config.get('config:active_upstream')
if active_upstream is 'global': if active_upstream == 'global':
# Installs module files to global upstream share directory # Installs module files to global upstream share directory
path = os.path.join(spack.paths.share_path, name) path = os.path.join(spack.paths.share_path, name)
elif active_upstream is not None: elif active_upstream is not None:
# Installs module files to upstream share directory. # Installs module files to upstream share directory.
# Extra logic is needed for determining this location. # Extra logic is needed for determining this location.
roots = spack.config.get('upstreams')[active_upstream][modules] roots = spack.config.get('upstreams')[active_upstream]['modules']
path = roots.get(name, os.path.join(spack.paths.user_share_path, name)) path = roots.get(name, os.path.join(spack.paths.user_share_path, name))
else: else:
# If no upstream is active, install module files to user share directory. # If no upstream is active install module file to user share directory.
roots = spack.config.get('config:module_roots', {}) roots = spack.config.get('config:module_roots', {})
path = roots.get(name, os.path.join(spack.paths.user_share_path, name)) path = roots.get(name, os.path.join(spack.paths.user_share_path, name))
return spack.util.path.canonicalize_path(path) return spack.util.path.canonicalize_path(path)