From bd198312c9db1b5d3b4ba95629b503ce88fffd00 Mon Sep 17 00:00:00 2001
From: Massimiliano Culpo <massimiliano.culpo@gmail.com>
Date: Tue, 22 Nov 2022 12:35:36 +0100
Subject: [PATCH] Revert "Warn about removal of deprecated format strings
 (#33829)" (#34056)

This reverts commit 7f9af8d4a0bfbb1577e5ac9982624d8d0cb9b9ca.
---
 etc/spack/defaults/config.yaml                   | 4 ++--
 lib/spack/spack/spec.py                          | 5 +----
 lib/spack/spack/test/directory_layout.py         | 2 +-
 share/spack/qa/configuration/windows_config.yaml | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/etc/spack/defaults/config.yaml b/etc/spack/defaults/config.yaml
index ee1cb0a324..b3356428fe 100644
--- a/etc/spack/defaults/config.yaml
+++ b/etc/spack/defaults/config.yaml
@@ -19,7 +19,7 @@ config:
   install_tree:
     root: $spack/opt/spack
     projections:
-      all: "${architecture}/${compiler.name}-${compiler.version}/${name}-${version}-${hash}"
+      all: "${ARCHITECTURE}/${COMPILERNAME}-${COMPILERVER}/${PACKAGE}-${VERSION}-${HASH}"
     # install_tree can include an optional padded length (int or boolean)
     # default is False (do not pad)
     # if padded_length is True, Spack will pad as close to the system max path
@@ -214,4 +214,4 @@ config:
 
   # Number of seconds a buildcache's index.json is cached locally before probing
   # for updates, within a single Spack invocation. Defaults to 10 minutes.
-  binary_index_ttl: 600
+  binary_index_ttl: 600
\ No newline at end of file
diff --git a/lib/spack/spack/spec.py b/lib/spack/spack/spec.py
index 1995009381..5c688d916f 100644
--- a/lib/spack/spack/spec.py
+++ b/lib/spack/spack/spec.py
@@ -4418,10 +4418,7 @@ def old_format(self, format_string="$_$@$%@+$+$=", **kwargs):
         TODO: allow, e.g., ``$6#`` to customize short hash length
         TODO: allow, e.g., ``$//`` for full hash.
         """
-        tty.warn(
-            "Using the old Spec.format method."
-            " This method was deprecated in Spack v0.15 and will be removed in Spack v0.20"
-        )
+
         color = kwargs.get("color", False)
 
         # Dictionary of transformations for named tokens
diff --git a/lib/spack/spack/test/directory_layout.py b/lib/spack/spack/test/directory_layout.py
index 80d4db2071..86d160c5cc 100644
--- a/lib/spack/spack/test/directory_layout.py
+++ b/lib/spack/spack/test/directory_layout.py
@@ -59,7 +59,7 @@ def test_yaml_directory_layout_parameters(tmpdir, default_mock_concretization):
     arch_scheme = (
         "{architecture.platform}/{architecture.target}/{architecture.os}/{name}/{version}/{hash:7}"
     )
-    ns_scheme = "${architecture}/${namespace}/${name}-${version}-${hash:7}"
+    ns_scheme = "${ARCHITECTURE}/${NAMESPACE}/${PACKAGE}-${VERSION}-${HASH:7}"
     arch_ns_scheme_projections = {"all": arch_scheme, "python": ns_scheme}
     layout_arch_ns = DirectoryLayout(str(tmpdir), projections=arch_ns_scheme_projections)
 
diff --git a/share/spack/qa/configuration/windows_config.yaml b/share/spack/qa/configuration/windows_config.yaml
index a51cd110d1..fb90000223 100644
--- a/share/spack/qa/configuration/windows_config.yaml
+++ b/share/spack/qa/configuration/windows_config.yaml
@@ -3,6 +3,6 @@ config:
   install_tree:
     root: $spack\opt\spack
     projections:
-      all: '${architecture}\${compiler.name}-${compiler.version}\${name}-${version}-${hash}'
+      all: '${ARCHITECTURE}\${COMPILERNAME}-${COMPILERVER}\${PACKAGE}-${VERSION}-${HASH}'
   build_stage:
-    - ~/.spack/stage
+    - ~/.spack/stage
\ No newline at end of file