diff options
| author | Massimiliano Culpo <massimiliano.culpo@googlemail.com> | 2017-05-03 06:21:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-03 06:21:37 +0200 |
| commit | ae9a9e019a73cb951d4d2a2585ac71a53f351c81 (patch) | |
| tree | 34e2c1fb2c4b3f519c699a9c7ecba046be5a1698 /var | |
| parent | 72d45f7a446a6293ff675fce652a62f27ef2ed77 (diff) | |
| download | spack-ae9a9e019a73cb951d4d2a2585ac71a53f351c81.tar.gz spack-ae9a9e019a73cb951d4d2a2585ac71a53f351c81.tar.bz2 spack-ae9a9e019a73cb951d4d2a2585ac71a53f351c81.tar.xz spack-ae9a9e019a73cb951d4d2a2585ac71a53f351c81.zip | |
spack: no stacktrace if not in debug mode + fix emacs variant (#4098)
* spack: no stacktrace if not in debug mode + fix emacs variant
* emacs: removed dead code
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/emacs/package.py | 13 |
1 files changed, 7 insertions, 6 deletions
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) |