1 files changed, 5 insertions, 2 deletions
diff --git a/bin/spack b/bin/spack
index fb9f045f35..df517c1f1d 100755
--- a/bin/spack
+++ b/bin/spack
@@ -41,7 +41,7 @@ sys.path.insert(0, SPACK_LIB_PATH)
 
 # If there is no working directory, use the spack prefix.
 try:
-    os.getcwd()
+    working_dir = os.getcwd()
 except OSError:
     os.chdir(SPACK_PREFIX)
 
@@ -77,8 +77,11 @@ for cmd in spack.cmd.commands:
 args = parser.parse_args()
 
 # Set up environment based on args.
-spack.verbose = args.verbose
+tty.set_verbose(args.verbose)
+tty.set_debug(args.debug)
 spack.debug = args.debug
+
+spack.spack_working_dir = working_dir
 if args.mock:
     from spack.packages import PackageDB
     spack.db = PackageDB(spack.mock_packages_path)