summaryrefslogtreecommitdiff
path: root/engine/SCons/Variables/EnumVariable.py
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2011-09-10 10:58:07 +0200
committerLuca Falavigna <dktrkranz@debian.org>2011-09-10 10:58:07 +0200
commit7d0cf46e8ad5acb1028a391255a9b84d2f6d3cdf (patch)
treebcf7a54e7f8ad198e6d31adf0fffc0e0c74469e4 /engine/SCons/Variables/EnumVariable.py
parentde2237c3cf3dd7dcc0a914f78348fdb6d821c296 (diff)
parent9dc7be6c34e2bda6d0d96a450bb8eee03b277ba3 (diff)
Merge commit 'upstream/2.1.0'
Diffstat (limited to 'engine/SCons/Variables/EnumVariable.py')
-rw-r--r--engine/SCons/Variables/EnumVariable.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/SCons/Variables/EnumVariable.py b/engine/SCons/Variables/EnumVariable.py
index c9cdbb7..60a3c5d 100644
--- a/engine/SCons/Variables/EnumVariable.py
+++ b/engine/SCons/Variables/EnumVariable.py
@@ -15,7 +15,7 @@ Usage example:
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -37,7 +37,7 @@ Usage example:
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Variables/EnumVariable.py 5134 2010/08/16 23:02:40 bdeegan"
+__revision__ = "src/engine/SCons/Variables/EnumVariable.py 5357 2011/09/09 21:31:03 bdeegan"
__all__ = ['EnumVariable',]
@@ -47,7 +47,7 @@ import SCons.Errors
def _validator(key, val, env, vals):
if not val in vals:
raise SCons.Errors.UserError(
- 'Invalid value for option %s: %s' % (key, val))
+ 'Invalid value for option %s: %s. Valid values are: %s' % (key, val, vals))
def EnumVariable(key, help, default, allowed_values, map={}, ignorecase=0):