From 1d07e4cb8d734f54483e0892e13f8367140abc83 Mon Sep 17 00:00:00 2001
From: Douglas Jacobsen <dwjacobsen@google.com>
Date: Mon, 30 Oct 2023 11:52:40 -0600
Subject: [PATCH] Isolate util/lock and util/naming

---
 lib/spack/spack/test/util/spack_lock_wrapper.py | 7 ++++---
 lib/spack/spack/util/lock.py                    | 5 ++---
 lib/spack/spack/util/naming.py                  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/spack/spack/test/util/spack_lock_wrapper.py b/lib/spack/spack/test/util/spack_lock_wrapper.py
index 0909ce06c33..6ce79eb13fe 100644
--- a/lib/spack/spack/test/util/spack_lock_wrapper.py
+++ b/lib/spack/spack/test/util/spack_lock_wrapper.py
@@ -12,6 +12,7 @@
 
 import spack.config
 import spack.util.lock as lk
+import spack.util.error
 
 
 def test_disable_locking(tmpdir):
@@ -54,7 +55,7 @@ def test_lock_checks_user(tmpdir):
 
     # unsafe
     tmpdir.chmod(0o777)
-    with pytest.raises(spack.error.SpackError):
+    with pytest.raises(spack.util.error.UtilityError):
         lk.check_lock_safety(path)
 
     # safe
@@ -85,12 +86,12 @@ def test_lock_checks_group(tmpdir):
 
     # unsafe
     tmpdir.chmod(0o774)
-    with pytest.raises(spack.error.SpackError):
+    with pytest.raises(spack.util.error.UtilityError):
         lk.check_lock_safety(path)
 
     # unsafe
     tmpdir.chmod(0o777)
-    with pytest.raises(spack.error.SpackError):
+    with pytest.raises(spack.util.error.UtilityError):
         lk.check_lock_safety(path)
 
     # safe
diff --git a/lib/spack/spack/util/lock.py b/lib/spack/spack/util/lock.py
index 0174dad0570..877b9a9bb0e 100644
--- a/lib/spack/spack/util/lock.py
+++ b/lib/spack/spack/util/lock.py
@@ -18,8 +18,7 @@
 from llnl.util.lock import ReadTransaction  # noqa: F401
 from llnl.util.lock import WriteTransaction  # noqa: F401
 
-import spack.error
-import spack.paths
+import spack.util.error
 
 
 class Lock(llnl.util.lock.Lock):
@@ -100,4 +99,4 @@ def check_lock_safety(path: str) -> None:
                 f"Running a shared spack without locks is unsafe. You must "
                 f"restrict permissions on {path} or enable locks."
             )
-            raise spack.error.SpackError(msg, long_msg)
+            raise spack.util.error.UtilityError(msg, long_msg)
diff --git a/lib/spack/spack/util/naming.py b/lib/spack/spack/util/naming.py
index d7f51d8645a..f3a89875705 100644
--- a/lib/spack/spack/util/naming.py
+++ b/lib/spack/spack/util/naming.py
@@ -8,7 +8,7 @@
 import re
 import string
 
-import spack.error
+import spack.util.error
 
 __all__ = [
     "mod_to_class",
@@ -159,7 +159,7 @@ def validate_fully_qualified_module_name(mod_name):
         raise InvalidFullyQualifiedModuleNameError(mod_name)
 
 
-class InvalidModuleNameError(spack.error.SpackError):
+class InvalidModuleNameError(spack.util.error.UtilityError):
     """Raised when we encounter a bad module name."""
 
     def __init__(self, name):
@@ -167,7 +167,7 @@ def __init__(self, name):
         self.name = name
 
 
-class InvalidFullyQualifiedModuleNameError(spack.error.SpackError):
+class InvalidFullyQualifiedModuleNameError(spack.util.error.UtilityError):
     """Raised when we encounter a bad full package name."""
 
     def __init__(self, name):