BaseTools/UPT: Fix UNI file name issue

[mirror_edk2.git] / 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 05b5fb17da18c989c7f36785ffeb8af2428bf89e..278073e4a379786ba26c5f1b832bec32f1fb7049 100644 (file)
--- a/BaseTools/Source/Python/UPT/Library/String.py
+++ b/BaseTools/Source/Python/UPT/Library/String.py
@@ -962,8 +962,14 @@ def IsMatchArch(Arch1, Arch2):
 # Return the FileName with index +1 under the FilePath\r
 #\r
 def GetUniFileName(FilePath, FileName):\r
-    Files = os.listdir(FilePath)\r
+    Files = []\r
+    try:\r
+        Files = os.listdir(FilePath)\r
+    except:\r
+        pass\r
+\r
     LargestIndex = -1\r
+    IndexNotFound = True\r
     for File in Files:\r
         if File.upper().startswith(FileName.upper()) and File.upper().endswith('.UNI'):\r
             Index = File.upper().replace(FileName.upper(), '').replace('.UNI', '')\r
@@ -973,11 +979,12 @@ def GetUniFileName(FilePath, FileName):
                 except Exception:\r
                     Index = -1\r
             else:\r
+                IndexNotFound = False\r
                 Index = 0\r
             if Index > LargestIndex:\r
                 LargestIndex = Index + 1\r
 \r
-    if LargestIndex > -1:\r
+    if LargestIndex > -1 and not IndexNotFound:\r
         return os.path.normpath(os.path.join(FilePath, FileName + str(LargestIndex) + '.uni'))\r
     else:\r
         return os.path.normpath(os.path.join(FilePath, FileName + '.uni'))\r