Revision: 19387
http://sourceforge.net/p/edk2/code/19387
Author: vanjeff
Date: 2015-12-18 06:55:09 +0000 (Fri, 18 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.
(Sync patch r19319 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/19319
Modified Paths:
--------------
branches/UDK2015/BaseTools/Source/Python/GenFds/Region.py
Modified: branches/UDK2015/BaseTools/Source/Python/GenFds/Region.py
===================================================================
--- branches/UDK2015/BaseTools/Source/Python/GenFds/Region.py 2015-12-18
06:54:36 UTC (rev 19386)
+++ branches/UDK2015/BaseTools/Source/Python/GenFds/Region.py 2015-12-18
06:55:09 UTC (rev 19387)
@@ -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
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
