summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorbecker33 <becker33@llnl.gov>2016-09-02 14:59:14 -0700
committerGitHub <noreply@github.com>2016-09-02 14:59:14 -0700
commitea6143402fb612ea069853b01f541aecbba64750 (patch)
tree49f3e7ee446acde0b48a13983b99d2f1e729c9ac /var
parent83a8a8ed22cf3e10236acec36f8e261cd50a8f46 (diff)
parent817c120b1c649963b15bab77e9568eba03ff9e51 (diff)
downloadspack-ea6143402fb612ea069853b01f541aecbba64750.tar.gz
spack-ea6143402fb612ea069853b01f541aecbba64750.tar.bz2
spack-ea6143402fb612ea069853b01f541aecbba64750.tar.xz
spack-ea6143402fb612ea069853b01f541aecbba64750.zip
Merge pull request #1715 from alfredo-gimenez/bugfix/vim
Fix vim package.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/vim/package.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/vim/package.py b/var/spack/repos/builtin/packages/vim/package.py
index 01eccfab57..5f2e5e19d9 100644
--- a/var/spack/repos/builtin/packages/vim/package.py
+++ b/var/spack/repos/builtin/packages/vim/package.py
@@ -71,14 +71,14 @@ class Vim(Package):
for fs in self.feature_sets:
if "+" + fs in spec:
if feature_set is not None:
- tty.error(
+ raise InstallError(
"Only one feature set allowed, specified %s and %s"
% (feature_set, fs))
feature_set = fs
if '+gui' in spec:
if feature_set is not None:
- if feature_set is not 'huge':
- tty.error(
+ if feature_set != 'huge':
+ raise InstallError(
"+gui variant requires 'huge' feature set, "
"%s was specified" % feature_set)
feature_set = 'huge'