BaseTools: Support nest field name in DSC/DEC

[mirror_edk2.git] / BaseTools / Source / Python / Workspace / DscBuildData.py

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 23c2c0d4102e92a421cbe5fc0397641f4a555d75..4642e761b9150c4055b9a5b64b0965cbaa53a53a 100644 (file)
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -1207,18 +1207,19 @@ class DscBuildData(PlatformBuildClassObject):
 \r
         def get_length(value):\r
             Value = value.strip()\r
-            if Value.startswith('GUID') and Value.endswith(')'):\r
-                return 16\r
-            if Value.startswith('L"') and Value.endswith('"'):\r
-                return len(Value[2:-1])\r
-            if Value[0] == '"' and Value[-1] == '"':\r
-                return len(Value) - 2\r
-            if Value[0] == '{' and Value[-1] == '}':\r
-                return len(Value.split(","))\r
-            if Value.startswith("L'") and Value.endswith("'") and len(list(Value[2:-1])) > 1:\r
-                return  len(list(Value[2:-1]))\r
-            if Value[0] == "'" and Value[-1] == "'" and len(list(Value[1:-1])) > 1:\r
-                return len(Value) - 2\r
+            if len(value) > 1:\r
+                if Value.startswith('GUID') and Value.endswith(')'):\r
+                    return 16\r
+                if Value.startswith('L"') and Value.endswith('"'):\r
+                    return len(Value[2:-1])\r
+                if Value[0] == '"' and Value[-1] == '"':\r
+                    return len(Value) - 2\r
+                if Value[0] == '{' and Value[-1] == '}':\r
+                    return len(Value.split(","))\r
+                if Value.startswith("L'") and Value.endswith("'") and len(list(Value[2:-1])) > 1:\r
+                    return  len(list(Value[2:-1]))\r
+                if Value[0] == "'" and Value[-1] == "'" and len(list(Value[1:-1])) > 1:\r
+                    return len(Value) - 2\r
             return len(Value)\r
 \r
         return str(max([pcd_size for pcd_size in [get_length(item) for item in sku_values]]))\r