Arrange llnl imports to be used as the first attempt and the new imports as the fallback

install.py

@@ -16,7 +16,10 @@
 import os
 import sys
 
-import spack.llnl.util.tty as tty
+try:
+    import spack.llnl.util.tty as tty
+except ImportError:
+    import spack.util.tty as tty
 import spack.main
 
 spec = importlib.util.spec_from_file_location(

manager/__init__.py

@@ -13,13 +13,16 @@
 
 import os
 
-import spack.llnl.util.tty as tty
+try:
+    import spack.llnl.util.tty as tty
+except ImportError:
+    import spack.util.tty as tty
 import spack.util.spack_yaml as syaml
 
 try:
-    import spack.util.filesystem as fs
-except ImportError:
     import spack.llnl.util.filesystem as fs
+except ImportError:
+    import spack.util.filesystem as fs
 
 
 _default_config = """

manager/manager_cmds/develop.py

@@ -9,7 +9,11 @@
 import shutil
 
 import spack.cmd
-import spack.llnl.util.tty as tty
+
+try:
+    import spack.llnl.util.tty as tty
+except ImportError:
+    import spack.util.tty as tty
 import spack.util.executable
 from spack.cmd.develop import develop as s_develop
 from spack.cmd.develop import setup_parser as s_setup_parser

manager/manager_cmds/distribution.py

@@ -16,10 +16,13 @@
 import spack.extensions
 
 try:
+    import spack.llnl.util.filesystem as fs
+except ImportError:
     import spack.util.filesystem as fs
+try:
+    import spack.llnl.util.tty as tty
 except ImportError:
-    import spack.llnl.util.filesystem as fs
-import spack.llnl.util.tty as tty
+    import spack.util.tty as tty
 import spack.main
 import spack.solver.asp
 import spack.spec

manager/manager_cmds/external.py

@@ -10,7 +10,11 @@
 import spack
 import spack.config
 import spack.environment as ev
-import spack.llnl.util.tty as tty
+
+try:
+    import spack.llnl.util.tty as tty
+except ImportError:
+    import spack.util.tty as tty
 import spack.util.spack_yaml as syaml
 from spack.detection.common import _pkg_config_dict
 from spack.extensions.manager.environment_utils import SpackManagerEnvironmentManifest

manager/manager_cmds/include.py

@@ -8,7 +8,10 @@
 import os
 import sys
 
-import spack.llnl.util.tty as tty
+try:
+    import spack.llnl.util.tty as tty
+except ImportError:
+    import spack.util.tty as tty
 
 from .. import projects
 from .find_machine import find_machine, machine_defined

manager/manager_cmds/lock_diff.py

@@ -12,7 +12,11 @@
 import sys
 
 import spack.environment as ev
-import spack.llnl.util.tty as tty
+
+try:
+    import spack.llnl.util.tty as tty
+except ImportError:
+    import spack.util.tty as tty
 from spack.spec import Spec
 
 command_name = "lock-diff"

manager/manager_cmds/make.py

@@ -13,10 +13,13 @@
 import spack.paths
 
 try:
+    from spack.llnl.util.filesystem import working_dir
+except ImportError:
     from spack.util.filesystem import working_dir
+try:
+    import spack.llnl.util.tty as tty
 except ImportError:
-    from spack.llnl.util.filesystem import working_dir
-import spack.llnl.util.tty as tty
+    import spack.util.tty as tty
 from spack.util.executable import Executable
 
 """

manager/manager_cmds/pin.py

@@ -12,7 +12,11 @@
 import os
 
 import spack.cmd
-import spack.llnl.util.tty as tty
+
+try:
+    import spack.llnl.util.tty as tty
+except ImportError:
+    import spack.util.tty as tty
 import spack.main
 import spack.traverse as traverse
 import spack.util.executable

manager/projects.py

@@ -7,9 +7,9 @@
 import os
 
 try:
-    import spack.util.lang as lang
-except ImportError:
     import spack.llnl.util.lang as lang
+except ImportError:
+    import spack.util.lang as lang
 from . import config_yaml
 from .manager_utils import canonicalize_path