Update BaseTools from main trunk r18767.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2015@18784 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 4 insertions, 3 deletions

diff --git a/BaseTools/Source/Python/UPT/MkPkg.py b/BaseTools/Source/Python/UPT/MkPkg.py
index 2eb84588bd..87c84f0cc2 100644
--- a/BaseTools/Source/Python/UPT/MkPkg.py
+++ b/BaseTools/Source/Python/UPT/MkPkg.py
@@ -50,6 +50,7 @@ from Library.ParserValidate import IsValidPath
 

 from Core.DistributionPackageClass import DistributionPackageClass

 from Core.PackageFile import PackageFile

+from Common.MultipleWorkspace import MultipleWorkspace as mws

 

 ## CheckForExistingDp

 #

@@ -136,7 +137,7 @@ def Main(Options = None):
                 # write().

                 #

                 FromFile = os.path.normpath(FileObject.GetURI()).encode('utf_8')

-                FileFullPath = os.path.normpath(os.path.join(WorkspaceDir, FromFile))

+                FileFullPath = mws.join(WorkspaceDir, FromFile)

                 if FileFullPath in RePkgDict:

                     (DpGuid, DpVersion, DpName, Repackage) = RePkgDict[FileFullPath]

                     if not Repackage:

@@ -183,7 +184,7 @@ def Main(Options = None):
                     DistPkg.Header.RePackage = True

           

         Cwd = getcwd()

-        chdir(WorkspaceDir)        

+        chdir(WorkspaceDir)

         ContentFile.PackFiles(FileList)

         chdir(Cwd)

         

@@ -264,7 +265,7 @@ def CheckFileList(QualifiedExt, FileList, ErrorStringExt, ErrorStringFullPath):
                          ErrorStringExt % Item)

         

         Item = os.path.normpath(Item)

-        Path = os.path.normpath(os.path.join(WorkspaceDir, Item))

+        Path = mws.join(WorkspaceDir, Item)

         if not os.path.exists(Path):

             Logger.Error("\nMkPkg", FILE_NOT_FOUND, ST.ERR_NOT_FOUND % Item)

         elif Item == Path: