From 02e316e7724e8f39e69306f03bcbff1eaa12827c Mon Sep 17 00:00:00 2001
From: Todd Gamblin <tgamblin@llnl.gov>
Date: Wed, 18 Feb 2015 16:45:54 -0800
Subject: Convert ValueErrors to SpackError subclass.
---
lib/spack/spack/package.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index 492af12053..fed62f6cb7 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -941,16 +941,17 @@ class Package(object):
def _sanity_check_extension(self):
if not self.is_extension:
- raise ValueError("This package is not an extension.")
+ raise ActivationError("This package is not an extension.")
+
extendee_package = self.extendee_spec.package
extendee_package._check_extendable()
if not extendee_package.installed:
- raise ValueError("Can only (de)activate extensions for installed packages.")
+ raise ActivationError("Can only (de)activate extensions for installed packages.")
if not self.installed:
- raise ValueError("Extensions must first be installed.")
+ raise ActivationError("Extensions must first be installed.")
if not self.extendee_spec.name in self.extendees:
- raise ValueError("%s does not extend %s!" % (self.name, self.extendee.name))
+ raise ActivationError("%s does not extend %s!" % (self.name, self.extendee.name))
def do_activate(self, **kwargs):
--
cgit v1.2.3-70-g09d2