License header updated to match correct format.

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / GuidSection.py

diff --git a/BaseTools/Source/Python/GenFds/GuidSection.py b/BaseTools/Source/Python/GenFds/GuidSection.py
index 97d8ba8f76704b78acbc8cff506c2fbac717258e..0e5bb3b27072289c43c58e1de59fd0e4047ccaf4 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GuidSection.py
+++ b/BaseTools/Source/Python/GenFds/GuidSection.py
@@ -198,7 +198,7 @@ class GuidSection(GuidSectionClassObject) :
                 HeaderLength = str(self.ExtraHeaderSize)\r
 \r
             if self.ProcessRequired == "NONE" and HeaderLength == None:\r
-                if TempFileSize > InputFileSize and TempFileSize % 4 == 0:\r
+                if TempFileSize > InputFileSize:\r
                     FileHandleIn.seek(0)\r
                     BufferIn  = FileHandleIn.read()\r
                     FileHandleOut.seek(0)\r
@@ -247,15 +247,15 @@ class GuidSection(GuidSectionClassObject) :
         if self.KeyStringList == None or self.KeyStringList == []:\r
             Target = GenFdsGlobalVariable.TargetName\r
             ToolChain = GenFdsGlobalVariable.ToolChainTag\r
-            ToolDb = ToolDefClassObject.ToolDefDict(GenFdsGlobalVariable.WorkSpaceDir).ToolsDefTxtDatabase\r
+            ToolDb = ToolDefClassObject.ToolDefDict(GenFdsGlobalVariable.ConfDir).ToolsDefTxtDatabase\r
             if ToolChain not in ToolDb['TOOL_CHAIN_TAG']:\r
                 EdkLogger.error("GenFds", GENFDS_ERROR, "Can not find external tool because tool tag %s is not defined in tools_def.txt!" % ToolChain)\r
             self.KeyStringList = [Target+'_'+ToolChain+'_'+self.CurrentArchList[0]]\r
             for Arch in self.CurrentArchList:\r
-                if Target+'_'+ToolChain+'_'+Arch not in self.KeyStringList:\r
-                    self.KeyStringList.append(Target+'_'+ToolChain+'_'+Arch)\r
-                    \r
-        ToolDefinition = ToolDefClassObject.ToolDefDict(GenFdsGlobalVariable.WorkSpaceDir).ToolsDefTxtDictionary\r
+                if Target + '_' + ToolChain + '_' + Arch not in self.KeyStringList:\r
+                    self.KeyStringList.append(Target + '_' + ToolChain + '_' + Arch)\r
+\r
+        ToolDefinition = ToolDefClassObject.ToolDefDict(GenFdsGlobalVariable.ConfDir).ToolsDefTxtDictionary\r
         ToolPathTmp = None\r
         for ToolDef in ToolDefinition.items():\r
             if self.NameGuid == ToolDef[1]:\r