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

env view failures: print underlying error message (#18713)

Browse Source
This commit is contained in:
Greg Becker 2020-09-18 10:21:14 -07:00 committed by GitHub
parent 44c7826892
commit 2e4892c111
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/spack/llnl/util/filesystem.py
View File

@ -680,7 +680,7 @@ def replace_directory_transaction(directory_name, tmp_root=None):
try: try:
yield tmp_dir yield tmp_dir
except (Exception, KeyboardInterrupt, SystemExit): except (Exception, KeyboardInterrupt, SystemExit) as e:
# Delete what was there, before copying back the original content # Delete what was there, before copying back the original content
if os.path.exists(directory_name): if os.path.exists(directory_name):
shutil.rmtree(directory_name) shutil.rmtree(directory_name)
@ -691,6 +691,7 @@ def replace_directory_transaction(directory_name, tmp_root=None):
tty.debug('DIRECTORY RECOVERED [{0}]'.format(directory_name)) tty.debug('DIRECTORY RECOVERED [{0}]'.format(directory_name))
msg = 'the transactional move of "{0}" failed.' msg = 'the transactional move of "{0}" failed.'
msg += '\n ' + str(e)
raise RuntimeError(msg.format(directory_name)) raise RuntimeError(msg.format(directory_name))
else: else:
# Otherwise delete the temporary directory # Otherwise delete the temporary directory

11
lib/spack/spack/test/cmd/env.py
View File

@ -1041,6 +1041,17 @@ def test_env_updates_view_install(
check_mpileaks_and_deps_in_view(view_dir) check_mpileaks_and_deps_in_view(view_dir)
def test_env_view_fails(
tmpdir, mock_packages, mock_stage, mock_fetch, install_mockery):
view_dir = tmpdir.mkdir('view')
env('create', '--with-view=%s' % view_dir, 'test')
with ev.read('test'):
add('libelf')
add('libelf cflags=-g')
with pytest.raises(RuntimeError, match='merge blocked by file'):
install('--fake')
def test_env_without_view_install( def test_env_without_view_install(
tmpdir, mock_stage, mock_fetch, install_mockery): tmpdir, mock_stage, mock_fetch, install_mockery):
# Test enabling a view after installing specs # Test enabling a view after installing specs