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

Skip invisible non-packages in package directory. (#12467)

Browse Source 
Having a non-directory invisible file causes `spack find` to die. This
fixes the logic to ignore invalid module names but only warn if they're
visible.
```
NotADirectoryError: [Errno 20] Not a directory: '/spack/var/spack/repos/builtin/packages/.DS_Store/package.py'
```
This commit is contained in:
Seth R. Johnson 2019-08-23 00:42:17 -04:00 committed by Massimiliano Culpo
parent a707c5bd2b
commit c86006e948
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/spack/spack/repo.py
View File

@ -150,11 +150,11 @@ def _create_new_cache(self):
pkg_dir = os.path.join(self.packages_path, pkg_name) pkg_dir = os.path.join(self.packages_path, pkg_name)
# Warn about invalid names that look like packages. # Warn about invalid names that look like packages.
if (not valid_module_name(pkg_name) if not valid_module_name(pkg_name):
and not pkg_name.startswith('.')): if not pkg_name.startswith('.'):
msg = 'Skipping package at {0}. ' tty.warn('Skipping package at {0}. "{1}" is not '
msg += '"{1}" is not a valid Spack module name.' 'a valid Spack module name.'.format(
tty.warn(msg.format(pkg_dir, pkg_name)) pkg_dir, pkg_name))
continue continue
# Construct the file name from the directory # Construct the file name from the directory

6
lib/spack/spack/test/repo.py
View File

@ -64,3 +64,9 @@ def test_repo_last_mtime():
latest_mtime = max(os.path.getmtime(p.module.__file__) latest_mtime = max(os.path.getmtime(p.module.__file__)
for p in spack.repo.path.all_packages()) for p in spack.repo.path.all_packages())
assert spack.repo.path.last_mtime() == latest_mtime assert spack.repo.path.last_mtime() == latest_mtime
def test_repo_invisibles(repo_for_test, extra_repo):
with open(os.path.join(extra_repo.root, 'packages', '.invisible'), 'w'):
pass
extra_repo.all_package_names()