1. Rename CommandError -> InstallError

2. InstallError now subclasses SpackError vs. StandardError (so it is now
handled by the spack shell script)

2 files changed, 7 insertions, 5 deletions

diff --git a/lib/spack/spack/build_environment.py b/lib/spack/spack/build_environment.py
index 0d179f563b..620ad5be9e 100644
--- a/lib/spack/spack/build_environment.py
+++ b/lib/spack/spack/build_environment.py
@@ -36,6 +36,7 @@ from llnl.util.filesystem import *
 
 import spack
 import spack.compilers as compilers
+from spack.error import SpackError
 from spack.util.executable import Executable, which
 from spack.util.environment import *
 
@@ -296,8 +297,9 @@ def fork(pkg, function):
         # message.  Just make the parent exit with an error code.
         pid, returncode = os.waitpid(pid, 0)
         if returncode != 0:
-            raise CommandError(returncode)
+            raise InstallError("Installation process had nonzero exit code."
+                .format(str(returncode)))
 
 
-class CommandError(StandardError):
-    pass
+class InstallError(SpackError):
+    """Raised when a package fails to install"""
diff --git a/lib/spack/spack/cmd/test-install.py b/lib/spack/spack/cmd/test-install.py
index aeb90ae733..a9f9331fcb 100644
--- a/lib/spack/spack/cmd/test-install.py
+++ b/lib/spack/spack/cmd/test-install.py
@@ -32,7 +32,7 @@ import llnl.util.tty as tty
 from llnl.util.filesystem import *
 
 import spack
-from spack.build_environment import CommandError
+from spack.build_environment import InstallError
 import spack.cmd
 
 description = "Treat package installations as unit tests and output formatted test results"
@@ -190,7 +190,7 @@ def test_install(parser, args):
                     make_jobs=args.jobs,
                     verbose=True,
                     fake=False)
-            except CommandError:
+            except InstallError:
                 pass
    
     jrf = JunitResultFormat()