From 6b0011c8f1293510a784a0eaa0a2a10e03339f16 Mon Sep 17 00:00:00 2001 From: Jordan Galby <67924449+Jordan474@users.noreply.github.com> Date: Wed, 28 Aug 2024 18:38:54 +0200 Subject: [PATCH] For "when:" and install_environment.json: Support fully qualified hostname (#45522) --- lib/spack/docs/environments.rst | 5 +++-- lib/spack/spack/spec.py | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/spack/docs/environments.rst b/lib/spack/docs/environments.rst index ffa5e5f3c38..b3dd57840b0 100644 --- a/lib/spack/docs/environments.rst +++ b/lib/spack/docs/environments.rst @@ -893,8 +893,9 @@ The valid variables for a ``when`` clause are: #. ``env``. The user environment (usually ``os.environ`` in Python). -#. ``hostname``. The hostname of the system (if ``hostname`` is an - executable in the user's PATH). +#. ``hostname``. The hostname of the system. + +#. ``full_hostname``. The fully qualified hostname of the system. ^^^^^^^^^^^^^^^^^^^^^^^^ SpecLists as Constraints diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py index 1fb21b348ba..92e70e90da5 100644 --- a/lib/spack/spack/spec.py +++ b/lib/spack/spack/spec.py @@ -4892,6 +4892,7 @@ def get_host_environment() -> Dict[str, Any]: "architecture": arch_spec, "arch_str": str(arch_spec), "hostname": socket.gethostname(), + "full_hostname": socket.getfqdn(), }