Automated merge with https://bitbucket.org/premake/premake-dev

2011-11-19 12:20:23 -05:00 · 2011-11-19 12:20:23 -05:00 · 52a9ffdaa6
commit 52a9ffdaa6
parent 0957d63b36 1c679acae4
2 changed files with 8 additions and 1 deletions
--- a/CHANGES.txt
+++ b/CHANGES.txt
@ -1,3 +1,10 @@
+--------
+Sony NGP  (in progress)
+--------
+
+* The error message for invalid flags now includes the offending value 
+
+
 -------
  4.4  (in progress)
 -------
--- a/src/base/api.lua
+++ b/src/base/api.lua
@ -138,7 +138,7 @@
 			
 				if allowed_flags[value] then return value 
 				else 
-					return nil, "invalid flag"
+					return nil, "invalid flag '" .. value .. "'"
 				end
 			end,
 		},