From 5a57246eab80f00ae2481970d12a2abc345a2730 Mon Sep 17 00:00:00 2001 From: "Marvin.Haeuser@outlook.com" Date: Sat, 19 May 2018 18:50:25 +0800 Subject: BaseTools: Rename String to StringUtils. For case-insensitive file systems, edk2 String.py collides with the Python string.py, which results in build errors. This,for example, applies to building via the Windows Subsystem for Linux from a DriveFS file system. This patch renames String to StringUtils to prevent conflicts for case-insensitive file systems. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Marvin Haeuser Reviewed-by: Liming Gao --- BaseTools/Source/Python/Eot/Eot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'BaseTools/Source/Python/Eot/Eot.py') diff --git a/BaseTools/Source/Python/Eot/Eot.py b/BaseTools/Source/Python/Eot/Eot.py index 786868d55d..dfd1146af7 100644 --- a/BaseTools/Source/Python/Eot/Eot.py +++ b/BaseTools/Source/Python/Eot/Eot.py @@ -18,7 +18,7 @@ import Common.LongFilePathOs as os, time, glob import Common.EdkLogger as EdkLogger import EotGlobalData from optparse import OptionParser -from Common.String import NormPath +from Common.StringUtils import NormPath from Common import BuildToolError from Common.Misc import GuidStructureStringToGuidString, sdict from InfParserLite import * -- cgit v1.2.3