From f71b163020d7f97e0533c412d175bc642f628ef6 Mon Sep 17 00:00:00 2001 From: Hess Chen Date: Wed, 23 Aug 2017 13:53:36 +0800 Subject: BaseTools/UPT: Fix UNI file name issue Fix the issue of creating duplicate UNI file names Fix the issue of removing packages Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hess Chen Reviewed-by: Yonghong Zhu --- BaseTools/Source/Python/UPT/Library/String.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'BaseTools/Source/Python/UPT/Library/String.py') diff --git a/BaseTools/Source/Python/UPT/Library/String.py b/BaseTools/Source/Python/UPT/Library/String.py index 89371dbdbf..278073e4a3 100644 --- a/BaseTools/Source/Python/UPT/Library/String.py +++ b/BaseTools/Source/Python/UPT/Library/String.py @@ -969,6 +969,7 @@ def GetUniFileName(FilePath, FileName): pass LargestIndex = -1 + IndexNotFound = True for File in Files: if File.upper().startswith(FileName.upper()) and File.upper().endswith('.UNI'): Index = File.upper().replace(FileName.upper(), '').replace('.UNI', '') @@ -978,11 +979,12 @@ def GetUniFileName(FilePath, FileName): except Exception: Index = -1 else: + IndexNotFound = False Index = 0 if Index > LargestIndex: LargestIndex = Index + 1 - if LargestIndex > -1: + if LargestIndex > -1 and not IndexNotFound: return os.path.normpath(os.path.join(FilePath, FileName + str(LargestIndex) + '.uni')) else: return os.path.normpath(os.path.join(FilePath, FileName + '.uni')) -- cgit v1.2.3