From 817c120b1c649963b15bab77e9568eba03ff9e51 Mon Sep 17 00:00:00 2001
From: Alfredo Gimenez <gimenez1@llnl.gov>
Date: Fri, 2 Sep 2016 14:09:46 -0700
Subject: [PATCH] Fix vim package

---
 var/spack/repos/builtin/packages/vim/package.py | 6 +++---
 1 file 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 @@ def install(self, spec, prefix):
         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'
-- 
GitLab