diff options
| -rwxr-xr-x | bin/spack | 2 | ||||
| -rw-r--r-- | lib/spack/spack/variant.py | 4 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/emacs/package.py | 13 |
3 files changed, 11 insertions, 8 deletions
@@ -194,6 +194,8 @@ def _main(args, unknown_args): return_val = command(parser, args) except SpackError as e: e.die() + except Exception as e: + tty.die(str(e)) except KeyboardInterrupt: sys.stderr.write('\n') tty.die("Keyboard interrupt.") diff --git a/lib/spack/spack/variant.py b/lib/spack/spack/variant.py index 7102676b69..2d02ab1253 100644 --- a/lib/spack/spack/variant.py +++ b/lib/spack/spack/variant.py @@ -389,9 +389,9 @@ class BoolValuedVariant(SingleValuedVariant): self._original_value = value self._value = False else: - msg = 'cannot construct a BoolValuedVariant from ' + msg = 'cannot construct a BoolValuedVariant for "{0}" from ' msg += 'a value that does not represent a bool' - raise ValueError(msg) + raise ValueError(msg.format(self.name)) def __contains__(self, item): return item is self.value diff --git a/var/spack/repos/builtin/packages/emacs/package.py b/var/spack/repos/builtin/packages/emacs/package.py index 71733eebd2..195cb1281f 100644 --- a/var/spack/repos/builtin/packages/emacs/package.py +++ b/var/spack/repos/builtin/packages/emacs/package.py @@ -36,8 +36,12 @@ class Emacs(AutotoolsPackage): version('24.5', 'd74b597503a68105e61b5b9f6d065b44') variant('X', default=False, description="Enable an X toolkit") - variant('toolkit', default='gtk', - description="Select an X toolkit (gtk, athena)") + variant( + 'toolkit', + default='gtk', + values=('gtk', 'athena'), + description="Select an X toolkit (gtk, athena)" + ) depends_on('pkg-config@0.9.0:', type='build') @@ -53,12 +57,9 @@ class Emacs(AutotoolsPackage): def configure_args(self): spec = self.spec - args = [] + toolkit = spec.variants['toolkit'].value if '+X' in spec: - if toolkit not in ('gtk', 'athena'): - raise InstallError("toolkit must be in (gtk, athena), not %s" % - toolkit) args = [ '--with-x', '--with-x-toolkit={0}'.format(toolkit) |