This patch is going to:

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Object / Parser / InfGuidObject.py

diff --git a/BaseTools/Source/Python/UPT/Object/Parser/InfGuidObject.py b/BaseTools/Source/Python/UPT/Object/Parser/InfGuidObject.py
index 4f1a3f4e81aab5e20a6fbc87c74b3d10df894598..23125552e06d025ab0270ac1550913192e506b63 100644 (file)
--- a/BaseTools/Source/Python/UPT/Object/Parser/InfGuidObject.py
+++ b/BaseTools/Source/Python/UPT/Object/Parser/InfGuidObject.py
@@ -2,7 +2,7 @@
 # This file is used to define class objects of INF file [Guids] section. \r
 # It will consumed by InfParser. \r
 #\r
-# Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are licensed and made available \r
 # under the terms and conditions of the BSD License which accompanies this \r
@@ -156,7 +156,6 @@ def ParseGuidComment(CommentsList, InfGuidItemObj):
             #   \r
             if CommentItemUsage == CommentItemGuidType == PreUsage == PreGuidType == DT.ITEM_UNDEFINED:\r
                 CommentItemHelpText = PreHelpText + DT.END_OF_LINE + CommentItemHelpText\r
-                \r
                 PreHelpText = CommentItemHelpText\r
                 \r
             if BlockFlag == 4:     \r
@@ -164,6 +163,8 @@ def ParseGuidComment(CommentsList, InfGuidItemObj):
                 CommentItemIns.SetUsageItem(CommentItemUsage)\r
                 CommentItemIns.SetGuidTypeItem(CommentItemGuidType)\r
                 CommentItemIns.SetVariableNameItem(CommentItemVarString)\r
+                if CommentItemHelpText == '' or CommentItemHelpText.endswith(DT.END_OF_LINE):\r
+                    CommentItemHelpText = CommentItemHelpText.strip(DT.END_OF_LINE)\r
                 CommentItemIns.SetHelpStringItem(CommentItemHelpText)\r
                 CommentInsList.append(CommentItemIns)\r
                 \r
@@ -180,7 +181,7 @@ def ParseGuidComment(CommentsList, InfGuidItemObj):
                 CommentItemIns.SetUsageItem(DT.ITEM_UNDEFINED)\r
                 CommentItemIns.SetGuidTypeItem(DT.ITEM_UNDEFINED)\r
                 if PreHelpText == '' or PreHelpText.endswith(DT.END_OF_LINE):\r
-                    PreHelpText += DT.END_OF_LINE\r
+                    PreHelpText = PreHelpText.strip(DT.END_OF_LINE)\r
                 CommentItemIns.SetHelpStringItem(PreHelpText)\r
                 CommentInsList.append(CommentItemIns)\r
                 #\r
@@ -190,6 +191,8 @@ def ParseGuidComment(CommentsList, InfGuidItemObj):
                 CommentItemIns.SetUsageItem(CommentItemUsage)\r
                 CommentItemIns.SetGuidTypeItem(CommentItemGuidType)\r
                 CommentItemIns.SetVariableNameItem(CommentItemVarString)\r
+                if CommentItemHelpText == '' or CommentItemHelpText.endswith(DT.END_OF_LINE):\r
+                    CommentItemHelpText = CommentItemHelpText.strip(DT.END_OF_LINE)\r
                 CommentItemIns.SetHelpStringItem(CommentItemHelpText)\r
                 CommentInsList.append(CommentItemIns)\r
                 \r