diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py index 94cac5d12d6..a7eb54734e4 100644 --- a/lib/spack/spack/package.py +++ b/lib/spack/spack/package.py @@ -13,6 +13,17 @@ # import most common types used in packages from typing import Dict, List, Optional + +class tty: + import llnl.util.tty as _tty + + debug = _tty.debug + error = _tty.error + info = _tty.info + msg = _tty.msg + warn = _tty.warn + + from llnl.util.filesystem import ( FileFilter, FileList, diff --git a/var/spack/repos/builtin/packages/additivefoam/package.py b/var/spack/repos/builtin/packages/additivefoam/package.py index 9be606e1fec..69280e20bf0 100644 --- a/var/spack/repos/builtin/packages/additivefoam/package.py +++ b/var/spack/repos/builtin/packages/additivefoam/package.py @@ -5,8 +5,6 @@ import inspect import os -import llnl.util.tty as tty - import spack.pkg.builtin.openfoam as openfoam from spack.package import * diff --git a/var/spack/repos/builtin/packages/aocc/package.py b/var/spack/repos/builtin/packages/aocc/package.py index 9d62defb9e2..242895a3cad 100644 --- a/var/spack/repos/builtin/packages/aocc/package.py +++ b/var/spack/repos/builtin/packages/aocc/package.py @@ -2,7 +2,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from llnl.util import tty from spack.package import * from spack.pkg.builtin.llvm import LlvmDetection diff --git a/var/spack/repos/builtin/packages/apcomp/package.py b/var/spack/repos/builtin/packages/apcomp/package.py index 0ca63872df8..347e34eba23 100644 --- a/var/spack/repos/builtin/packages/apcomp/package.py +++ b/var/spack/repos/builtin/packages/apcomp/package.py @@ -6,8 +6,6 @@ import os import socket -import llnl.util.tty as tty - from spack.build_systems.cmake import CMakeBuilder from spack.package import * diff --git a/var/spack/repos/builtin/packages/arkouda/package.py b/var/spack/repos/builtin/packages/arkouda/package.py index 6c61dba10fb..f528ada2b80 100644 --- a/var/spack/repos/builtin/packages/arkouda/package.py +++ b/var/spack/repos/builtin/packages/arkouda/package.py @@ -3,8 +3,6 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import llnl.util.tty as tty - from spack.package import * from spack.util.environment import set_env diff --git a/var/spack/repos/builtin/packages/ascent/package.py b/var/spack/repos/builtin/packages/ascent/package.py index ebca681c922..05ab6a10512 100644 --- a/var/spack/repos/builtin/packages/ascent/package.py +++ b/var/spack/repos/builtin/packages/ascent/package.py @@ -9,8 +9,6 @@ import sys from os import environ as env -import llnl.util.tty as tty - from spack.package import * diff --git a/var/spack/repos/builtin/packages/bcl2fastq2/package.py b/var/spack/repos/builtin/packages/bcl2fastq2/package.py index fb9b47022fd..1e9a97e8b2f 100644 --- a/var/spack/repos/builtin/packages/bcl2fastq2/package.py +++ b/var/spack/repos/builtin/packages/bcl2fastq2/package.py @@ -5,8 +5,6 @@ import glob import os -import llnl.util.tty as tty - from spack.package import * from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/bohrium/package.py b/var/spack/repos/builtin/packages/bohrium/package.py index 83d771c8d47..c40c64d8add 100644 --- a/var/spack/repos/builtin/packages/bohrium/package.py +++ b/var/spack/repos/builtin/packages/bohrium/package.py @@ -4,8 +4,6 @@ import os -import llnl.util.tty as tty - from spack.package import * from spack.package_test import compare_output from spack.pkg.builtin.boost import Boost diff --git a/var/spack/repos/builtin/packages/conduit/package.py b/var/spack/repos/builtin/packages/conduit/package.py index 7d9d343570f..1ab662acdec 100644 --- a/var/spack/repos/builtin/packages/conduit/package.py +++ b/var/spack/repos/builtin/packages/conduit/package.py @@ -8,8 +8,6 @@ import socket from os import environ as env -import llnl.util.tty as tty - from spack.package import * diff --git a/var/spack/repos/builtin/packages/cuda/package.py b/var/spack/repos/builtin/packages/cuda/package.py index 6d3ae0e81c3..e521a7ffc90 100644 --- a/var/spack/repos/builtin/packages/cuda/package.py +++ b/var/spack/repos/builtin/packages/cuda/package.py @@ -7,8 +7,6 @@ import re from glob import glob -import llnl.util.tty as tty - from spack.package import * # FIXME Remove hack for polymorphic versions @@ -741,7 +739,7 @@ def install(self, spec, prefix): os.remove("/tmp/cuda-installer.log") except OSError: if spec.satisfies("@10.1:"): - tty.die( + raise InstallError( "The cuda installer will segfault due to the " "presence of /tmp/cuda-installer.log " "please remove the file and try again " diff --git a/var/spack/repos/builtin/packages/dray/package.py b/var/spack/repos/builtin/packages/dray/package.py index 6c7fea12231..9f3b8437e65 100644 --- a/var/spack/repos/builtin/packages/dray/package.py +++ b/var/spack/repos/builtin/packages/dray/package.py @@ -5,8 +5,6 @@ import os import socket -import llnl.util.tty as tty - from spack.build_systems.cmake import CMakeBuilder from spack.package import * diff --git a/var/spack/repos/builtin/packages/fasta/package.py b/var/spack/repos/builtin/packages/fasta/package.py index 9c8dd6ccb6c..6c8885b4392 100644 --- a/var/spack/repos/builtin/packages/fasta/package.py +++ b/var/spack/repos/builtin/packages/fasta/package.py @@ -41,7 +41,7 @@ def makefile_name(self): elif self.spec.satisfies("platform=linux target=x86_64:"): name = "Makefile.linux64_sse2" else: - tty.die( + raise InstallError( """Unsupported platform/target, must be Darwin (assumes 64-bit) Linux x86_64 diff --git a/var/spack/repos/builtin/packages/foam-extend/package.py b/var/spack/repos/builtin/packages/foam-extend/package.py index 997d2433d68..f44601aea27 100644 --- a/var/spack/repos/builtin/packages/foam-extend/package.py +++ b/var/spack/repos/builtin/packages/foam-extend/package.py @@ -32,8 +32,6 @@ import os import re -import llnl.util.tty as tty - from spack.package import * from spack.pkg.builtin.openfoam import ( OpenfoamArch, diff --git a/var/spack/repos/builtin/packages/freeipmi/package.py b/var/spack/repos/builtin/packages/freeipmi/package.py index 56165e53b2e..b8b3f9350e6 100644 --- a/var/spack/repos/builtin/packages/freeipmi/package.py +++ b/var/spack/repos/builtin/packages/freeipmi/package.py @@ -2,7 +2,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import llnl.util.tty as tty from spack.package import * diff --git a/var/spack/repos/builtin/packages/gaussian-view/package.py b/var/spack/repos/builtin/packages/gaussian-view/package.py index cddbf44988c..dc66ef07799 100644 --- a/var/spack/repos/builtin/packages/gaussian-view/package.py +++ b/var/spack/repos/builtin/packages/gaussian-view/package.py @@ -5,8 +5,6 @@ import os -import llnl.util.tty as tty - import spack.tengine from spack.package import * diff --git a/var/spack/repos/builtin/packages/gcc-runtime/package.py b/var/spack/repos/builtin/packages/gcc-runtime/package.py index eb4b1520e20..95680003b7a 100644 --- a/var/spack/repos/builtin/packages/gcc-runtime/package.py +++ b/var/spack/repos/builtin/packages/gcc-runtime/package.py @@ -8,8 +8,6 @@ from macholib import MachO, mach_o -from llnl.util import tty - from spack.package import * from spack.util.elf import delete_needed_from_elf, parse_elf diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py index 5d43c49f0ed..e0d5690babd 100644 --- a/var/spack/repos/builtin/packages/gcc/package.py +++ b/var/spack/repos/builtin/packages/gcc/package.py @@ -7,7 +7,6 @@ import archspec.cpu -import llnl.util.tty as tty from llnl.util.symlink import readlink import spack.compiler diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 3179f686bb8..ac84f6a1ca8 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -8,7 +8,6 @@ import sys import llnl.util.lang -import llnl.util.tty as tty from spack.package import * diff --git a/var/spack/repos/builtin/packages/heasoft/package.py b/var/spack/repos/builtin/packages/heasoft/package.py index 20d8fc637e1..ed4b2071541 100644 --- a/var/spack/repos/builtin/packages/heasoft/package.py +++ b/var/spack/repos/builtin/packages/heasoft/package.py @@ -4,8 +4,6 @@ import os -import llnl.util.tty as tty - from spack.package import * from spack.util.environment import EnvironmentModifications diff --git a/var/spack/repos/builtin/packages/hpctoolkit/package.py b/var/spack/repos/builtin/packages/hpctoolkit/package.py index 58eb41e85b3..a39c1c20b69 100644 --- a/var/spack/repos/builtin/packages/hpctoolkit/package.py +++ b/var/spack/repos/builtin/packages/hpctoolkit/package.py @@ -6,8 +6,6 @@ import os import tempfile -import llnl.util.tty as tty - import spack.build_systems.autotools import spack.build_systems.meson from spack.package import * diff --git a/var/spack/repos/builtin/packages/intel-oneapi-runtime/package.py b/var/spack/repos/builtin/packages/intel-oneapi-runtime/package.py index 32a263125f2..2ff2e5b1889 100644 --- a/var/spack/repos/builtin/packages/intel-oneapi-runtime/package.py +++ b/var/spack/repos/builtin/packages/intel-oneapi-runtime/package.py @@ -3,8 +3,6 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os -from llnl.util import tty - from spack.package import * from spack.pkg.builtin.gcc_runtime import get_elf_libraries diff --git a/var/spack/repos/builtin/packages/intel/package.py b/var/spack/repos/builtin/packages/intel/package.py index 34adfd182e6..5e4159d8f99 100644 --- a/var/spack/repos/builtin/packages/intel/package.py +++ b/var/spack/repos/builtin/packages/intel/package.py @@ -3,8 +3,6 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import re -import llnl.util.tty as tty - import spack.compiler from spack.package import * diff --git a/var/spack/repos/builtin/packages/libcatalyst/package.py b/var/spack/repos/builtin/packages/libcatalyst/package.py index 2de2e6d2c82..2b32d8c9849 100644 --- a/var/spack/repos/builtin/packages/libcatalyst/package.py +++ b/var/spack/repos/builtin/packages/libcatalyst/package.py @@ -4,8 +4,6 @@ import subprocess -import llnl.util.tty as tty - from spack.package import * diff --git a/var/spack/repos/builtin/packages/libsodium/package.py b/var/spack/repos/builtin/packages/libsodium/package.py index 153577b9441..42a41c89a04 100644 --- a/var/spack/repos/builtin/packages/libsodium/package.py +++ b/var/spack/repos/builtin/packages/libsodium/package.py @@ -4,8 +4,6 @@ import os -import llnl.util.tty as tty - from spack.package import * diff --git a/var/spack/repos/builtin/packages/likwid/package.py b/var/spack/repos/builtin/packages/likwid/package.py index a6735297861..c3f297445fa 100644 --- a/var/spack/repos/builtin/packages/likwid/package.py +++ b/var/spack/repos/builtin/packages/likwid/package.py @@ -5,8 +5,6 @@ import glob import os -import llnl.util.tty as tty - import spack.tengine from spack.package import * diff --git a/var/spack/repos/builtin/packages/linux-perf/package.py b/var/spack/repos/builtin/packages/linux-perf/package.py index 0642088dd5d..71e5a08d7f8 100644 --- a/var/spack/repos/builtin/packages/linux-perf/package.py +++ b/var/spack/repos/builtin/packages/linux-perf/package.py @@ -7,8 +7,6 @@ import shutil from textwrap import dedent -import llnl.util.tty as tty - from spack.package import * diff --git a/var/spack/repos/builtin/packages/llvm-doe/package.py b/var/spack/repos/builtin/packages/llvm-doe/package.py index fea3f2825cf..37d22acd239 100644 --- a/var/spack/repos/builtin/packages/llvm-doe/package.py +++ b/var/spack/repos/builtin/packages/llvm-doe/package.py @@ -5,8 +5,6 @@ import re import sys -import llnl.util.tty as tty - from spack.build_systems.cmake import get_cmake_prefix_path from spack.package import * diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 7db9dcb6f93..9c282eb39ee 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -5,7 +5,6 @@ import re import sys -import llnl.util.tty as tty from llnl.util.lang import classproperty import spack.compilers diff --git a/var/spack/repos/builtin/packages/mercurial/package.py b/var/spack/repos/builtin/packages/mercurial/package.py index 8e1361d1f04..c548001b4a4 100644 --- a/var/spack/repos/builtin/packages/mercurial/package.py +++ b/var/spack/repos/builtin/packages/mercurial/package.py @@ -2,7 +2,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -from llnl.util import tty from spack.package import * diff --git a/var/spack/repos/builtin/packages/namd/package.py b/var/spack/repos/builtin/packages/namd/package.py index ab8433bc7f0..e2fb94c7186 100644 --- a/var/spack/repos/builtin/packages/namd/package.py +++ b/var/spack/repos/builtin/packages/namd/package.py @@ -6,8 +6,6 @@ import platform import sys -import llnl.util.tty as tty - from spack.build_environment import optimization_flags from spack.package import * diff --git a/var/spack/repos/builtin/packages/octopus/package.py b/var/spack/repos/builtin/packages/octopus/package.py index 86fde1094ae..6a690b1057a 100644 --- a/var/spack/repos/builtin/packages/octopus/package.py +++ b/var/spack/repos/builtin/packages/octopus/package.py @@ -4,8 +4,6 @@ import os -import llnl.util.tty as tty - from spack.package import * @@ -192,7 +190,7 @@ def configure_args(self): else: # To be foolproof, fail with a proper error message # if neither FFTW nor MKL are in the dependency tree. - tty.die( + raise InstallError( 'Unsupported "fftw-api" provider, ' "currently only FFTW and MKL are supported.\n" "Please report this issue on Spack's repository." diff --git a/var/spack/repos/builtin/packages/of-precice/package.py b/var/spack/repos/builtin/packages/of-precice/package.py index cb0adbdad6d..5980ac846f4 100644 --- a/var/spack/repos/builtin/packages/of-precice/package.py +++ b/var/spack/repos/builtin/packages/of-precice/package.py @@ -4,8 +4,6 @@ import os -import llnl.util.tty as tty - from spack.package import * from spack.pkg.builtin.openfoam import add_extra_files diff --git a/var/spack/repos/builtin/packages/openfoam-org/package.py b/var/spack/repos/builtin/packages/openfoam-org/package.py index 5ee5aea8a42..1525e613bac 100644 --- a/var/spack/repos/builtin/packages/openfoam-org/package.py +++ b/var/spack/repos/builtin/packages/openfoam-org/package.py @@ -38,8 +38,6 @@ import os import re -import llnl.util.tty as tty - from spack.package import * from spack.pkg.builtin.openfoam import ( OpenfoamArch, diff --git a/var/spack/repos/builtin/packages/openfoam/package.py b/var/spack/repos/builtin/packages/openfoam/package.py index 81745c83801..7cba440b2ed 100644 --- a/var/spack/repos/builtin/packages/openfoam/package.py +++ b/var/spack/repos/builtin/packages/openfoam/package.py @@ -43,8 +43,6 @@ import os import re -import llnl.util.tty as tty - from spack.package import * from spack.pkg.builtin.boost import Boost from spack.util.environment import EnvironmentModifications diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index b2f7d05ffe2..805156c20e3 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -7,8 +7,6 @@ import re import sys -import llnl.util.tty as tty - import spack.compilers from spack.package import * diff --git a/var/spack/repos/builtin/packages/openpbs/package.py b/var/spack/repos/builtin/packages/openpbs/package.py index a1c2015e41c..b99f014d23c 100644 --- a/var/spack/repos/builtin/packages/openpbs/package.py +++ b/var/spack/repos/builtin/packages/openpbs/package.py @@ -2,7 +2,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import llnl.util.tty as tty from spack.package import * diff --git a/var/spack/repos/builtin/packages/openssl/package.py b/var/spack/repos/builtin/packages/openssl/package.py index 0f62e959a1e..27cddb8d36f 100644 --- a/var/spack/repos/builtin/packages/openssl/package.py +++ b/var/spack/repos/builtin/packages/openssl/package.py @@ -5,8 +5,6 @@ import os import re -import llnl.util.tty as tty - from spack.package import * diff --git a/var/spack/repos/builtin/packages/oras/package.py b/var/spack/repos/builtin/packages/oras/package.py index 20b11f49311..f52f889b24b 100644 --- a/var/spack/repos/builtin/packages/oras/package.py +++ b/var/spack/repos/builtin/packages/oras/package.py @@ -2,7 +2,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import llnl.util.tty as tty from spack.package import * @@ -43,6 +42,6 @@ def install(self, spec, prefix): oras = find("bin", "oras") if not oras: - tty.die("Oras executable missing in bin.") + raise InstallError("Oras executable missing in bin.") tty.debug("Found oras executable %s to move into install bin" % oras[0]) install(oras[0], prefix.bin) diff --git a/var/spack/repos/builtin/packages/parallel-netcdf/package.py b/var/spack/repos/builtin/packages/parallel-netcdf/package.py index 6216d01df23..b8ea46ac23e 100644 --- a/var/spack/repos/builtin/packages/parallel-netcdf/package.py +++ b/var/spack/repos/builtin/packages/parallel-netcdf/package.py @@ -4,8 +4,6 @@ import os -import llnl.util.tty as tty - from spack.package import * diff --git a/var/spack/repos/builtin/packages/parsec/package.py b/var/spack/repos/builtin/packages/parsec/package.py index 9917a4bc057..522297a4ee3 100644 --- a/var/spack/repos/builtin/packages/parsec/package.py +++ b/var/spack/repos/builtin/packages/parsec/package.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) # -import llnl.util.tty as tty + from spack.package import * diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index cd33c1fa336..1f1a874a8ee 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -3,8 +3,6 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) import os -import llnl.util.tty as tty - from spack.package import * diff --git a/var/spack/repos/builtin/packages/phist/package.py b/var/spack/repos/builtin/packages/phist/package.py index 8b5e957b3c8..ec17bf0ec39 100644 --- a/var/spack/repos/builtin/packages/phist/package.py +++ b/var/spack/repos/builtin/packages/phist/package.py @@ -2,7 +2,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import llnl.util.tty as tty import spack.hooks.sbang as sbang from spack.package import * diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index aa0e3a66587..49c7fb29b46 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -12,7 +12,6 @@ from shutil import copy from typing import Dict, List -import llnl.util.tty as tty from llnl.util.lang import dedupe import spack.paths diff --git a/var/spack/repos/builtin/packages/qmcpack/package.py b/var/spack/repos/builtin/packages/qmcpack/package.py index 879c6233c02..4b2dbef9f74 100644 --- a/var/spack/repos/builtin/packages/qmcpack/package.py +++ b/var/spack/repos/builtin/packages/qmcpack/package.py @@ -2,7 +2,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import llnl.util.tty as tty from spack.package import * diff --git a/var/spack/repos/builtin/packages/qt-base/package.py b/var/spack/repos/builtin/packages/qt-base/package.py index d175262f1b3..36869caba59 100644 --- a/var/spack/repos/builtin/packages/qt-base/package.py +++ b/var/spack/repos/builtin/packages/qt-base/package.py @@ -8,8 +8,6 @@ import sys import tempfile -import llnl.util.tty as tty - from spack.operating_systems.mac_os import macos_version from spack.package import * diff --git a/var/spack/repos/builtin/packages/qt/package.py b/var/spack/repos/builtin/packages/qt/package.py index 899980cca16..ec95dc66a48 100644 --- a/var/spack/repos/builtin/packages/qt/package.py +++ b/var/spack/repos/builtin/packages/qt/package.py @@ -6,8 +6,6 @@ import platform import sys -import llnl.util.tty as tty - from spack.operating_systems.linux_distro import kernel_version from spack.operating_systems.mac_os import macos_version from spack.package import * diff --git a/var/spack/repos/builtin/packages/rpm/package.py b/var/spack/repos/builtin/packages/rpm/package.py index 15380a9af65..23b86e454bc 100644 --- a/var/spack/repos/builtin/packages/rpm/package.py +++ b/var/spack/repos/builtin/packages/rpm/package.py @@ -2,7 +2,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import llnl.util.tty as tty from spack.package import * diff --git a/var/spack/repos/builtin/packages/sarus/package.py b/var/spack/repos/builtin/packages/sarus/package.py index 8a919327595..7f2f051b4a5 100644 --- a/var/spack/repos/builtin/packages/sarus/package.py +++ b/var/spack/repos/builtin/packages/sarus/package.py @@ -2,7 +2,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import llnl.util.tty as tty from spack.package import * diff --git a/var/spack/repos/builtin/packages/singularityce/package.py b/var/spack/repos/builtin/packages/singularityce/package.py index cffa6dfca64..535f7866435 100644 --- a/var/spack/repos/builtin/packages/singularityce/package.py +++ b/var/spack/repos/builtin/packages/singularityce/package.py @@ -5,8 +5,6 @@ import os import shutil -import llnl.util.tty as tty - import spack.tengine from spack.package import * diff --git a/var/spack/repos/builtin/packages/strumpack/package.py b/var/spack/repos/builtin/packages/strumpack/package.py index 2342f0d6560..5ebead85410 100644 --- a/var/spack/repos/builtin/packages/strumpack/package.py +++ b/var/spack/repos/builtin/packages/strumpack/package.py @@ -4,8 +4,6 @@ import os -import llnl.util.tty as tty - from spack.package import * from spack.util.environment import set_env diff --git a/var/spack/repos/builtin/packages/swiftsim/package.py b/var/spack/repos/builtin/packages/swiftsim/package.py index c17d59514b4..7e09609dd5f 100644 --- a/var/spack/repos/builtin/packages/swiftsim/package.py +++ b/var/spack/repos/builtin/packages/swiftsim/package.py @@ -2,7 +2,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import llnl.util.tty as tty from spack.package import * diff --git a/var/spack/repos/builtin/packages/vtk-h/package.py b/var/spack/repos/builtin/packages/vtk-h/package.py index 1a93d29fea9..23231b66c3b 100644 --- a/var/spack/repos/builtin/packages/vtk-h/package.py +++ b/var/spack/repos/builtin/packages/vtk-h/package.py @@ -8,8 +8,6 @@ import sys from os import environ as env -import llnl.util.tty as tty - from spack.package import * diff --git a/var/spack/repos/builtin/packages/wrf/package.py b/var/spack/repos/builtin/packages/wrf/package.py index 5b3d034f8a6..4fb5cd3727c 100644 --- a/var/spack/repos/builtin/packages/wrf/package.py +++ b/var/spack/repos/builtin/packages/wrf/package.py @@ -10,8 +10,6 @@ from pathlib import Path from subprocess import PIPE, Popen -from llnl.util import tty - from spack.package import * if sys.platform != "win32": diff --git a/var/spack/repos/builtin/packages/xrootd/package.py b/var/spack/repos/builtin/packages/xrootd/package.py index 1b5de7bea69..5e6de0cb93a 100644 --- a/var/spack/repos/builtin/packages/xrootd/package.py +++ b/var/spack/repos/builtin/packages/xrootd/package.py @@ -259,7 +259,7 @@ def setup_build_environment(self, env): else: # The user has selected a (new?) legal value that we've # forgotten to deal with here. - tty.die( + raise InstallError( "INTERNAL ERROR: cannot accommodate unexpected variant ", "cxxstd={0}".format(self.spec.variants["cxxstd"].value), )