\r
from Core.DistributionPackageClass import DistributionPackageClass\r
from Core.PackageFile import PackageFile\r
+from Common.MultipleWorkspace import MultipleWorkspace as mws\r
\r
## CheckForExistingDp\r
#\r
# write().\r
#\r
FromFile = os.path.normpath(FileObject.GetURI()).encode('utf_8')\r
- FileFullPath = os.path.normpath(os.path.join(WorkspaceDir, FromFile))\r
+ FileFullPath = mws.join(WorkspaceDir, FromFile)\r
if FileFullPath in RePkgDict:\r
(DpGuid, DpVersion, DpName, Repackage) = RePkgDict[FileFullPath]\r
if not Repackage:\r
DistPkg.Header.RePackage = True\r
\r
Cwd = getcwd()\r
- chdir(WorkspaceDir) \r
+ chdir(WorkspaceDir)\r
ContentFile.PackFiles(FileList)\r
chdir(Cwd)\r
\r
ErrorStringExt % Item)\r
\r
Item = os.path.normpath(Item)\r
- Path = os.path.normpath(os.path.join(WorkspaceDir, Item))\r
+ Path = mws.join(WorkspaceDir, Item)\r
if not os.path.exists(Path):\r
Logger.Error("\nMkPkg", FILE_NOT_FOUND, ST.ERR_NOT_FOUND % Item)\r
elif Item == Path:\r