From 586360a8fe191585339a8dd69cc4eff400f6bb0b Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Thu, 19 Sep 2024 15:34:12 +0200 Subject: Revert "For "when:" and install_environment.json: Support fully qualified hos…" (#46478) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6b0011c8f1293510a784a0eaa0a2a10e03339f16. It caused a major performance penalty in unit test time on macOS (about 30 minutes). --- lib/spack/docs/environments.rst | 5 ++--- lib/spack/spack/spec.py | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/spack/docs/environments.rst b/lib/spack/docs/environments.rst index a8dd75831c..86be68d0c5 100644 --- a/lib/spack/docs/environments.rst +++ b/lib/spack/docs/environments.rst @@ -893,9 +893,8 @@ The valid variables for a ``when`` clause are: #. ``env``. The user environment (usually ``os.environ`` in Python). -#. ``hostname``. The hostname of the system. - -#. ``full_hostname``. The fully qualified hostname of the system. +#. ``hostname``. The hostname of the system (if ``hostname`` is an + executable in the user's PATH). ^^^^^^^^^^^^^^^^^^^^^^^^ SpecLists as Constraints diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index 28e11d68b8..fb1a05f37c 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -4908,7 +4908,6 @@ def get_host_environment() -> Dict[str, Any]: "architecture": arch_spec, "arch_str": str(arch_spec), "hostname": socket.gethostname(), - "full_hostname": socket.getfqdn(), } -- cgit v1.2.3-70-g09d2