Revision: 19319
http://sourceforge.net/p/edk2/code/19319
Author: yzhu52
Date: 2015-12-17 09:38:43 +0000 (Thu, 17 Dec 2015)
Log Message:
-----------
BaseTools: Fix one bug in FD region for multiple workspace support
Update the os.path.join to mws.join for FILE/INF/CAPSULE/FV region type.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong....@intel.com>
Reviewed-by: Liming Gao <liming....@intel.com>
Modified Paths:
--------------
trunk/edk2/BaseTools/Source/Python/GenFds/Region.py
Modified: trunk/edk2/BaseTools/Source/Python/GenFds/Region.py
===================================================================
--- trunk/edk2/BaseTools/Source/Python/GenFds/Region.py 2015-12-17 08:30:58 UTC
(rev 19318)
+++ trunk/edk2/BaseTools/Source/Python/GenFds/Region.py 2015-12-17 09:38:43 UTC
(rev 19319)
@@ -73,7 +73,7 @@
RegionData = GenFdsGlobalVariable.MacroExtend(RegionData,
MacroDict)
GenFdsGlobalVariable.InfLogger(' Region FV File Name =
.fv : %s' % RegionData)
if RegionData[1] != ':' :
- RegionData = os.path.join
(GenFdsGlobalVariable.WorkSpaceDir, RegionData)
+ RegionData = mws.join
(GenFdsGlobalVariable.WorkSpaceDir, RegionData)
if not os.path.exists(RegionData):
EdkLogger.error("GenFds", FILE_NOT_FOUND,
ExtraData=RegionData)
@@ -152,7 +152,7 @@
RegionData = GenFdsGlobalVariable.MacroExtend(RegionData,
MacroDict)
GenFdsGlobalVariable.InfLogger(' Region CAPSULE Image
Name = .cap : %s' % RegionData)
if RegionData[1] != ':' :
- RegionData = os.path.join
(GenFdsGlobalVariable.WorkSpaceDir, RegionData)
+ RegionData = mws.join
(GenFdsGlobalVariable.WorkSpaceDir, RegionData)
if not os.path.exists(RegionData):
EdkLogger.error("GenFds", FILE_NOT_FOUND,
ExtraData=RegionData)
@@ -213,7 +213,7 @@
else:
RegionData = GenFdsGlobalVariable.MacroExtend(RegionData,
MacroDict)
if RegionData[1] != ':' :
- RegionData = os.path.join
(GenFdsGlobalVariable.WorkSpaceDir, RegionData)
+ RegionData = mws.join
(GenFdsGlobalVariable.WorkSpaceDir, RegionData)
if not os.path.exists(RegionData):
EdkLogger.error("GenFds", FILE_NOT_FOUND,
ExtraData=RegionData)
#
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
edk2-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-commits
