Sync EDKII BaseTools to BaseTools project r1903.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10123 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 16 insertions, 13 deletions

diff --git a/BaseTools/Source/Python/GenFds/DepexSection.py b/BaseTools/Source/Python/GenFds/DepexSection.py
index a0a1905dfa..8650a73eb5 100644
--- a/BaseTools/Source/Python/GenFds/DepexSection.py
+++ b/BaseTools/Source/Python/GenFds/DepexSection.py
@@ -62,24 +62,27 @@ class DepexSection (DepexSectionClassObject):
     #   @retval tuple       (Generated file name list, section alignment)

     #

     def GenSection(self, OutputPath, ModuleName, SecNum, keyStringList, FfsFile = None, Dict = {}):

+        

+        if self.ExpressionProcessed == False:

+            self.Expression = self.Expression.replace("\n", " ").replace("\r", " ")

+            ExpList = self.Expression.split()

+            ExpGuidDict = {}

 

-        self.Expression = self.Expression.replace("\n", " ").replace("\r", " ")

-        ExpList = self.Expression.split()

-        ExpGuidDict = {}

+            for Exp in ExpList:

+                if Exp.upper() not in ('AND', 'OR', 'NOT', 'TRUE', 'FALSE', 'SOR', 'BEFORE', 'AFTER', 'END'):

+                    GuidStr = self.__FindGuidValue(Exp)

+                    if GuidStr == None:

+                        EdkLogger.error("GenFds", RESOURCE_NOT_AVAILABLE,

+                                        "Depex GUID %s could not be found in build DB! (ModuleName: %s)" % (Exp, ModuleName))

 

-        for Exp in ExpList:

-            if Exp.upper() not in ('AND', 'OR', 'NOT', 'TRUE', 'FALSE', 'SOR', 'BEFORE', 'AFTER', 'END'):

-                GuidStr = self.__FindGuidValue(Exp)

-                if GuidStr == None:

-                    EdkLogger.error("GenFds", RESOURCE_NOT_AVAILABLE,

-                                    "Depex GUID %s could not be found in build DB! (ModuleName: %s)" % (Exp, ModuleName))

+                    ExpGuidDict[Exp] = GuidStr

 

-                ExpGuidDict[Exp] = GuidStr

+            for Item in ExpGuidDict:

+                self.Expression = self.Expression.replace(Item, ExpGuidDict[Item])

 

-        for Item in ExpGuidDict:

-            self.Expression = self.Expression.replace(Item, ExpGuidDict[Item])

+            self.Expression = self.Expression.strip()

+            self.ExpressionProcessed = True

 

-        self.Expression = self.Expression.strip()

         if self.DepexType == 'PEI_DEPEX_EXP':

             ModuleType = 'PEIM'

             SecType    = 'PEI_DEPEX'