diff options
| author | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-05-23 08:27:14 +0000 |
|---|---|---|
| committer | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2012-05-23 08:27:14 +0000 |
| commit | 25918452ed5e9d12ea56b3bb2193df9ab96666b1 (patch) | |
| tree | 6565b567d47cbf90c95d1bba67982958d689a0f0 /BaseTools/Source/Python/Common | |
| parent | 74dee93181ad4914e9a708494e2056f1b3c4776f (diff) | |
| download | edk2-25918452ed5e9d12ea56b3bb2193df9ab96666b1.tar.gz edk2-25918452ed5e9d12ea56b3bb2193df9ab96666b1.tar.bz2 edk2-25918452ed5e9d12ea56b3bb2193df9ab96666b1.zip | |
Sync BaseTools Trunk (version r2524) to EDKII main trunk.
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liu Yingke <yingke.d.liu@intel.com>
Reviewed-by: Yurui Zeng <yurui.zeng@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13353 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'BaseTools/Source/Python/Common')
| -rw-r--r-- | BaseTools/Source/Python/Common/BuildVersion.py | 2 | ||||
| -rw-r--r-- | BaseTools/Source/Python/Common/Expression.py | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/BaseTools/Source/Python/Common/BuildVersion.py b/BaseTools/Source/Python/Common/BuildVersion.py index c5dae6daa4..0323fafa3c 100644 --- a/BaseTools/Source/Python/Common/BuildVersion.py +++ b/BaseTools/Source/Python/Common/BuildVersion.py @@ -13,4 +13,4 @@ # WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#
-gBUILD_VERSION = "Build 2518"
+gBUILD_VERSION = "Build 2524"
diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py index a4853b78a4..80fad7563d 100644 --- a/BaseTools/Source/Python/Common/Expression.py +++ b/BaseTools/Source/Python/Common/Expression.py @@ -256,9 +256,12 @@ class ValueExpression(object): if self.__IsNumberToken():
return self._Expr
- Token = self._GetToken()
- if type(Token) == type('') and Token.startswith('{') and Token.endswith('}') and self._Idx >= self._Len:
- return self._Expr
+ try:
+ Token = self._GetToken()
+ if type(Token) == type('') and Token.startswith('{') and Token.endswith('}') and self._Idx >= self._Len:
+ return self._Expr
+ except BadExpression:
+ pass
self._Idx = 0
self._Token = ''
|