BaseTools: Clean up source files

1. Do not use tab characters 2. No trailing white space in one line 3. All files must end with CRLF Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Liming Gao <liming.gao@intel.com> Cc: Yonghong Zhu <yonghong.zhu@intel.com> Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
2018-07-05 17:40:04 +08:00
parent 39456d00f3
commit f7496d7173
289 changed files with 10647 additions and 10647 deletions
--- a/BaseTools/Source/Python/UPT/Core/DependencyRules.py
+++ b/BaseTools/Source/Python/UPT/Core/DependencyRules.py
@@ -1,11 +1,11 @@
 ## @file
 # This file is for installed package information database operations
 #
-# Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available 
-# under the terms and conditions of the BSD License which accompanies this 
-# distribution. The full text of the license may be found at 
+# This program and the accompanying materials are licensed and made available
+# under the terms and conditions of the BSD License which accompanies this
+# distribution. The full text of the license may be found at
 # http://opensource.org/licenses/bsd-license.php
 #
 #
@@ -40,7 +40,7 @@ DEPEX_CHECK_PACKAGE_NOT_FOUND, DEPEX_CHECK_DP_NOT_FOUND) = (0, 1, 2, 3)
 ## DependencyRules
 #
 # This class represents the dependency rule check mechanism
-# 
+#
 # @param object:      Inherited from object class
 #
 class DependencyRules(object):
@@ -53,7 +53,7 @@ class DependencyRules(object):

        # Add package info from the DIST to be installed.
        self.PkgsToBeDepend.extend(self.GenToBeInstalledPkgList(ToBeInstalledPkgList))
-        
+
    def GenToBeInstalledPkgList(self, ToBeInstalledPkgList):
        if not ToBeInstalledPkgList:
            return []
@@ -81,7 +81,7 @@ class DependencyRules(object):
            return True
        else:
            return False
-        
+
    ## Check whether a module depex satisfied.
    #
    # @param ModuleObj: A module object
@@ -101,7 +101,7 @@ class DependencyRules(object):
            #
            Exist = self.CheckPackageExists(Dep.GetGuid(), Dep.GetVersion())
            #
-            # check whether satisfied by current distribution 
+            # check whether satisfied by current distribution
            #
            if not Exist:
                if DpObj is None:
@@ -119,7 +119,7 @@ class DependencyRules(object):
                else:
                    Result = False
                    break
-        
+
        if not Result:
            Logger.Error("CheckModuleDepex", UNKNOWN_ERROR, \
                         ST.ERR_DEPENDENCY_NOT_MATCH % (ModuleObj.GetName(), \
@@ -127,7 +127,7 @@ class DependencyRules(object):
                                                        Dep.GetGuid(), \
                                                        Dep.GetVersion()))
        return Result
-            
+
    ## Check whether a package exists in a package list specified by PkgsToBeDepend.
    #
    # @param Guid: Guid of a package
@@ -154,7 +154,7 @@ class DependencyRules(object):

        Logger.Verbose(ST.MSG_CHECK_PACKAGE_FINISH)
        return Found
-         
+
    ## Check whether a package depex satisfied.
    #
    # @param PkgObj: A package object
@@ -171,7 +171,7 @@ class DependencyRules(object):
            else:
                return False
        return True
-        
+
    ## Check whether a DP exists.
    #
    # @param Guid: Guid of a Distribution
@@ -216,7 +216,7 @@ class DependencyRules(object):
        return True, DpObj


-    ## Check whether a DP depex satisfied by current workspace 
+    ## Check whether a DP depex satisfied by current workspace
    #  (excluding the original distribution's packages to be replaced) for Replace
    #
    # @param DpObj:  A distribution object
@@ -243,17 +243,17 @@ class DependencyRules(object):
                continue
            else:
                return False
-            
+
        for ModKey in DpObj.ModuleSurfaceArea.keys():
            ModObj = DpObj.ModuleSurfaceArea[ModKey]
            if self.CheckModuleDepexSatisfied(ModObj, DpObj):
                continue
            else:
                return False
-        
+
        return True
-    
-    ## Check whether a DP could be removed from current workspace. 
+
+    ## Check whether a DP could be removed from current workspace.
    #
    # @param DpGuid:  File's guid
    # @param DpVersion: File's version
@@ -267,7 +267,7 @@ class DependencyRules(object):
        #
        # remove modules that included in current DP
        # List of item (FilePath)
-        DpModuleList = self.IpiDb.GetDpModuleList(DpGuid, DpVersion) 
+        DpModuleList = self.IpiDb.GetDpModuleList(DpGuid, DpVersion)
        for Module in DpModuleList:
            if Module in WsModuleList:
                WsModuleList.remove(Module)
@@ -277,7 +277,7 @@ class DependencyRules(object):
        #
        # get packages in current Dp and find the install path
        # List of item (PkgGuid, PkgVersion, InstallPath)
-        DpPackageList = self.IpiDb.GetPackageListFromDp(DpGuid, DpVersion) 
+        DpPackageList = self.IpiDb.GetPackageListFromDp(DpGuid, DpVersion)
        DpPackagePathList = []
        WorkSP = GlobalData.gWORKSPACE
        for (PkgName, PkgGuid, PkgVersion, DecFile) in self.WsPkgList:
@@ -290,18 +290,18 @@ class DependencyRules(object):
            else:
                InstallPath = DecPath
                DecFileRelaPath = DecFile
-                
+
            if (PkgGuid, PkgVersion, InstallPath) in DpPackageList:
                DpPackagePathList.append(DecFileRelaPath)
                DpPackageList.remove((PkgGuid, PkgVersion, InstallPath))
-        
+
        #
        # the left items in DpPackageList are the packages that installed but not found anymore
        #
        for (PkgGuid, PkgVersion, InstallPath) in DpPackageList:
            Logger.Warn("UPT",
                        ST.WARN_INSTALLED_PACKAGE_NOT_FOUND%(PkgGuid, PkgVersion, InstallPath))
-        
+
        #
        # check modules to see if has dependency on package of current DP
        #
@@ -320,7 +320,7 @@ class DependencyRules(object):
    # @param NewDpPkgList: a list of package information (Guid, Version) in new Dp
    # @retval Replaceable: True if distribution could be replaced, False Else
    # @retval DependModuleList: the list of modules that make distribution can not be replaced
-    # 
+    #
    def CheckDpDepexForReplace(self, OrigDpGuid, OrigDpVersion, NewDpPkgList):
        Replaceable = True
        DependModuleList = []
@@ -328,19 +328,19 @@ class DependencyRules(object):
        #
        # remove modules that included in current DP
        # List of item (FilePath)
-        DpModuleList = self.IpiDb.GetDpModuleList(OrigDpGuid, OrigDpVersion) 
+        DpModuleList = self.IpiDb.GetDpModuleList(OrigDpGuid, OrigDpVersion)
        for Module in DpModuleList:
            if Module in WsModuleList:
                WsModuleList.remove(Module)
            else:
                Logger.Warn("UPT\n",
                            ST.ERR_MODULE_NOT_INSTALLED % Module)
-        
+
        OtherPkgList = NewDpPkgList
        #
        # get packages in current Dp and find the install path
        # List of item (PkgGuid, PkgVersion, InstallPath)
-        DpPackageList = self.IpiDb.GetPackageListFromDp(OrigDpGuid, OrigDpVersion) 
+        DpPackageList = self.IpiDb.GetPackageListFromDp(OrigDpGuid, OrigDpVersion)
        DpPackagePathList = []
        WorkSP = GlobalData.gWORKSPACE
        for (PkgName, PkgGuid, PkgVersion, DecFile) in self.WsPkgList:
@@ -353,7 +353,7 @@ class DependencyRules(object):
            else:
                InstallPath = DecPath
                DecFileRelaPath = DecFile
-                
+
            if (PkgGuid, PkgVersion, InstallPath) in DpPackageList:
                DpPackagePathList.append(DecFileRelaPath)
                DpPackageList.remove((PkgGuid, PkgVersion, InstallPath))
@@ -366,7 +366,7 @@ class DependencyRules(object):
        for (PkgGuid, PkgVersion, InstallPath) in DpPackageList:
            Logger.Warn("UPT",
                        ST.WARN_INSTALLED_PACKAGE_NOT_FOUND%(PkgGuid, PkgVersion, InstallPath))
-        
+
        #
        # check modules to see if it can be satisfied by package not belong to removed DP
        #
@@ -376,8 +376,8 @@ class DependencyRules(object):
                DependModuleList.append(Module)
        return (Replaceable, DependModuleList)

-    
-## check whether module depends on packages in DpPackagePathList, return True 
+
+## check whether module depends on packages in DpPackagePathList, return True
 # if found, False else
 #
 # @param Path: a module path
@@ -432,7 +432,7 @@ def GetPackagePath(InfPath):
 # @param DpPackagePathList:  a list of Package Paths
 # @param OtherPkgList:       a list of Package Information (Guid, Version)
 # @retval:  False: module depends on package in DpPackagePathList and can not be satisfied by OtherPkgList
-#           True:  either module doesn't depend on DpPackagePathList or module depends on DpPackagePathList 
+#           True:  either module doesn't depend on DpPackagePathList or module depends on DpPackagePathList
 #                 but can be satisfied by OtherPkgList
 #
 def VerifyReplaceModuleDep(Path, DpPackagePathList, OtherPkgList):
--- a/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
+++ b/BaseTools/Source/Python/UPT/Core/DistributionPackageClass.py
@@ -1,11 +1,11 @@
 ## @file
 # This file is used to define a class object to describe a distribution package
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available 
-# under the terms and conditions of the BSD License which accompanies this 
-# distribution. The full text of the license may be found at 
+# This program and the accompanying materials are licensed and made available
+# under the terms and conditions of the BSD License which accompanies this
+# distribution. The full text of the license may be found at
 # http://opensource.org/licenses/bsd-license.php
 #
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
@@ -50,62 +50,62 @@ class DistributionPackageHeaderObject(IdentificationObject, \
        self.Date = ''
        self.Signature = 'Md5Sum'
        self.XmlSpecification = ''
-    
+
    def GetReadOnly(self):
        return self.ReadOnly
-    
+
    def SetReadOnly(self, ReadOnly):
        self.ReadOnly = ReadOnly
-    
+
    def GetRePackage(self):
        return self.RePackage
-    
+
    def SetRePackage(self, RePackage):
        self.RePackage = RePackage
-        
+
    def GetVendor(self):
        return self.Vendor
-    
+
    def SetDate(self, Date):
        self.Date = Date
-        
+
    def GetDate(self):
        return self.Date
-    
+
    def SetSignature(self, Signature):
        self.Signature = Signature
-        
+
    def GetSignature(self):
        return self.Signature
-    
+
    def SetXmlSpecification(self, XmlSpecification):
        self.XmlSpecification = XmlSpecification
-        
+
    def GetXmlSpecification(self):
        return self.XmlSpecification
-    
+
 ## DistributionPackageClass
 #
 # @param object: DistributionPackageClass
-# 
+#
 class DistributionPackageClass(object):
    def __init__(self):
        self.Header = DistributionPackageHeaderObject()
        #
        # {(Guid, Version, Path) : PackageObj}
        #
-        self.PackageSurfaceArea = Sdict() 
+        self.PackageSurfaceArea = Sdict()
        #
        # {(Guid, Version, Name, Path) : ModuleObj}
        #
-        self.ModuleSurfaceArea = Sdict()  
+        self.ModuleSurfaceArea = Sdict()
        self.Tools = MiscFileObject()
        self.MiscellaneousFiles = MiscFileObject()
        self.UserExtensions = []
        self.FileList = []
-    
+
    ## Get all included packages and modules for a distribution package
-    # 
+    #
    # @param WorkspaceDir:  WorkspaceDir
    # @param PackageList:   A list of all packages
    # @param ModuleList:    A list of all modules
@@ -132,7 +132,7 @@ class DistributionPackageClass(object):
                    WsRelPath = os.path.normpath(WsRelPath)
                    if ModuleList and WsRelPath in ModuleList:
                        Logger.Error("UPT",
-                                     OPTION_VALUE_INVALID, 
+                                     OPTION_VALUE_INVALID,
                                     ST.ERR_NOT_STANDALONE_MODULE_ERROR%\
                                     (WsRelPath, PackageFile))
                    Filename = os.path.normpath\
@@ -140,12 +140,12 @@ class DistributionPackageClass(object):
                    os.path.splitext(Filename)
                    #
                    # Call INF parser to generate Inf Object.
-                    # Actually, this call is not directly call, but wrapped by 
+                    # Actually, this call is not directly call, but wrapped by
                    # Inf class in InfPomAlignment.
                    #
                    try:
                        ModuleObj = InfPomAlignment(Filename, WorkspaceDir, PackageObj.GetPackagePath())
-     
+
                        #
                        # Add module to package
                        #
@@ -161,7 +161,7 @@ class DistributionPackageClass(object):
                                        ST.WRN_EDK1_INF_FOUND%Filename)
                        else:
                            raise
-                
+
                self.PackageSurfaceArea\
                [(PackageObj.GetGuid(), PackageObj.GetVersion(), \
                  PackageObj.GetCombinePath())] = PackageObj
@@ -176,16 +176,16 @@ class DistributionPackageClass(object):

                try:
                    ModuleObj = InfPomAlignment(ModuleFileFullPath, WorkspaceDir)
-                    ModuleKey = (ModuleObj.GetGuid(), 
-                                 ModuleObj.GetVersion(), 
-                                 ModuleObj.GetName(), 
+                    ModuleKey = (ModuleObj.GetGuid(),
+                                 ModuleObj.GetVersion(),
+                                 ModuleObj.GetName(),
                                 ModuleObj.GetCombinePath())
                    self.ModuleSurfaceArea[ModuleKey] = ModuleObj
                except FatalError as ErrCode:
                    if ErrCode.message == EDK1_INF_ERROR:
                        Logger.Error("UPT",
                                     EDK1_INF_ERROR,
-                                     ST.WRN_EDK1_INF_FOUND%ModuleFileFullPath, 
+                                     ST.WRN_EDK1_INF_FOUND%ModuleFileFullPath,
                                     ExtraData=ST.ERR_NOT_SUPPORTED_SA_MODULE)
                    else:
                        raise
@@ -193,16 +193,16 @@ class DistributionPackageClass(object):
        # Recover WorkspaceDir
        WorkspaceDir = Root

-    ## Get all files included for a distribution package, except tool/misc of 
+    ## Get all files included for a distribution package, except tool/misc of
    # distribution level
-    # 
+    #
    # @retval DistFileList  A list of filepath for NonMetaDataFile, relative to workspace
    # @retval MetaDataFileList  A list of filepath for MetaDataFile, relative to workspace
    #
    def GetDistributionFileList(self):
        MetaDataFileList = []
        SkipModulesUniList = []
-        
+
        for Guid, Version, Path in self.PackageSurfaceArea:
            Package = self.PackageSurfaceArea[Guid, Version, Path]
            PackagePath = Package.GetPackagePath()
@@ -221,7 +221,7 @@ class DistributionPackageClass(object):
                    MiscFileFullPath = os.path.normpath(os.path.join(PackagePath, FileObj.GetURI()))
                    if MiscFileFullPath not in self.FileList:
                        self.FileList.append(MiscFileFullPath)
-            
+
            Module = None
            ModuleDict = Package.GetModuleDict()
            for Guid, Version, Name, Path in ModuleDict:
@@ -262,12 +262,12 @@ class DistributionPackageClass(object):
            for NonMetaDataFile in NonMetaDataFileList:
                if NonMetaDataFile not in self.FileList:
                    self.FileList.append(NonMetaDataFile)
-            
+
        for SkipModuleUni in SkipModulesUniList:
            if SkipModuleUni in self.FileList:
                self.FileList.remove(SkipModuleUni)

        return  self.FileList, MetaDataFileList

-        
+

--- a/BaseTools/Source/Python/UPT/Core/FileHook.py
+++ b/BaseTools/Source/Python/UPT/Core/FileHook.py
@@ -1,11 +1,11 @@
 ## @file
 # This file hooks file and directory creation and removal
 #
-# Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available 
-# under the terms and conditions of the BSD License which accompanies this 
-# distribution. The full text of the license may be found at 
+# This program and the accompanying materials are licensed and made available
+# under the terms and conditions of the BSD License which accompanies this
+# distribution. The full text of the license may be found at
 # http://opensource.org/licenses/bsd-license.php
 #
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
--- a/BaseTools/Source/Python/UPT/Core/IpiDb.py
+++ b/BaseTools/Source/Python/UPT/Core/IpiDb.py
@@ -1,11 +1,11 @@
 ## @file
 # This file is for installed package information database operations
 #
-# Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available 
-# under the terms and conditions of the BSD License which accompanies this 
-# distribution. The full text of the license may be found at 
+# This program and the accompanying materials are licensed and made available
+# under the terms and conditions of the BSD License which accompanies this
+# distribution. The full text of the license may be found at
 # http://opensource.org/licenses/bsd-license.php
 #
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
@@ -33,8 +33,8 @@ import platform as pf
 #
 # This class represents the installed package information database
 # Add/Remove/Get installed distribution package information here.
-# 
-# 
+#
+#
 # @param object:      Inherited from object class
 # @param DbPath:      A string for the path of the database
 #
@@ -71,16 +71,16 @@ class IpiDatabase(object):
                SqlCommand = """
                create table %s (
                Dummy TEXT NOT NULL,
-                PRIMARY KEY (Dummy)                                               
+                PRIMARY KEY (Dummy)
                )""" % self.DummyTable
                self.Cur.execute(SqlCommand)
                self.Conn.commit()
            except sqlite3.OperationalError:
-                Logger.Error("UPT", 
-                             UPT_ALREADY_RUNNING_ERROR, 
+                Logger.Error("UPT",
+                             UPT_ALREADY_RUNNING_ERROR,
                             ST.ERR_UPT_ALREADY_RUNNING_ERROR
                             )
-        
+
        #
        # Create new table
        #
@@ -89,12 +89,12 @@ class IpiDatabase(object):
        DpGuid TEXT NOT NULL,DpVersion TEXT NOT NULL,
        InstallTime REAL NOT NULL,
        NewPkgFileName TEXT NOT NULL,
-        PkgFileName TEXT NOT NULL,                                               
+        PkgFileName TEXT NOT NULL,
        RePackage TEXT NOT NULL,
-        PRIMARY KEY (DpGuid, DpVersion)                                               
+        PRIMARY KEY (DpGuid, DpVersion)
        )""" % self.DpTable
        self.Cur.execute(SqlCommand)
-        
+
        SqlCommand = """
        create table IF NOT EXISTS %s (
        FilePath TEXT NOT NULL,
@@ -104,7 +104,7 @@ class IpiDatabase(object):
        PRIMARY KEY (FilePath)
        )""" % self.DpFileListTable
        self.Cur.execute(SqlCommand)
-        
+
        SqlCommand = """
        create table IF NOT EXISTS %s (
        PackageGuid TEXT NOT NULL,
@@ -116,7 +116,7 @@ class IpiDatabase(object):
        PRIMARY KEY (PackageGuid, PackageVersion, InstallPath)
        )""" % self.PkgTable
        self.Cur.execute(SqlCommand)
-                
+
        SqlCommand = """
        create table IF NOT EXISTS %s (
        ModuleGuid TEXT NOT NULL,
@@ -129,7 +129,7 @@ class IpiDatabase(object):
        PRIMARY KEY (ModuleGuid, ModuleVersion, ModuleName, InstallPath)
        )""" % self.ModInPkgTable
        self.Cur.execute(SqlCommand)
-        
+
        SqlCommand = """
        create table IF NOT EXISTS %s (
        ModuleGuid TEXT NOT NULL,
@@ -142,7 +142,7 @@ class IpiDatabase(object):
        PRIMARY KEY (ModuleGuid, ModuleVersion, ModuleName, InstallPath)
        )""" % self.StandaloneModTable
        self.Cur.execute(SqlCommand)
-        
+
        SqlCommand = """
        create table IF NOT EXISTS %s (
        ModuleGuid TEXT NOT NULL,
@@ -153,9 +153,9 @@ class IpiDatabase(object):
        DepexVersion TEXT
        )""" % self.ModDepexTable
        self.Cur.execute(SqlCommand)
-        
+
        self.Conn.commit()
-        
+
        Logger.Verbose(ST.MSG_INIT_IPI_FINISH)

    def RollBack(self):
@@ -199,7 +199,7 @@ class IpiDatabase(object):
                    self._AddDpFilePathList(DpObj.Header.GetGuid(), \
                                            DpObj.Header.GetVersion(), FilePath, \
                                            Md5Sum)
-    
+
            for ModKey in DpObj.ModuleSurfaceArea.keys():
                ModGuid = ModKey[0]
                ModVersion = ModKey[1]
@@ -219,17 +219,17 @@ class IpiDatabase(object):
                    self._AddDpFilePathList(DpObj.Header.GetGuid(), \
                                            DpObj.Header.GetVersion(), \
                                            Path, Md5Sum)
-    
+
            #
            # add tool/misc files
            #
            for (Path, Md5Sum) in DpObj.FileList:
                self._AddDpFilePathList(DpObj.Header.GetGuid(), \
                                        DpObj.Header.GetVersion(), Path, Md5Sum)
-                                    
+
            self._AddDp(DpObj.Header.GetGuid(), DpObj.Header.GetVersion(), \
                        NewDpPkgFileName, DpPkgFileName, RePackage)
-    
+
        except sqlite3.IntegrityError as DetailMsg:
            Logger.Error("UPT",
                         UPT_DB_UPDATE_ERROR,
@@ -239,17 +239,17 @@ class IpiDatabase(object):

    ## Add a distribution install information
    #
-    # @param Guid         Guid of the distribution package  
-    # @param Version      Version of the distribution package  
+    # @param Guid         Guid of the distribution package
+    # @param Version      Version of the distribution package
    # @param NewDpFileName the saved filename of distribution package file
    # @param DistributionFileName the filename of distribution package file
    #
    def _AddDp(self, Guid, Version, NewDpFileName, DistributionFileName, \
               RePackage):
-        
+
        if Version is None or len(Version.strip()) == 0:
            Version = 'N/A'
-        
+
        #
        # Add newly installed DP information to DB.
        #
@@ -264,10 +264,10 @@ class IpiDatabase(object):
         DistributionFileName, str(RePackage).upper())
        self.Cur.execute(SqlCommand)

-        
+
    ## Add a file list from DP
    #
-    # @param DpGuid: A DpGuid 
+    # @param DpGuid: A DpGuid
    # @param DpVersion: A DpVersion
    # @param Path: A Path
    # @param Path: A Md5Sum
@@ -284,26 +284,26 @@ class IpiDatabase(object):
        (self.DpFileListTable, Path, DpGuid, DpVersion, Md5Sum)

        self.Cur.execute(SqlCommand)
-            
+
    ## Add a package install information
    #
-    # @param Guid: A package guid 
+    # @param Guid: A package guid
    # @param Version: A package version
-    # @param DpGuid: A DpGuid 
+    # @param DpGuid: A DpGuid
    # @param DpVersion: A DpVersion
    # @param Path: A Path
    #
    def _AddPackage(self, Guid, Version, DpGuid=None, DpVersion=None, Path=''):
-        
+
        if Version is None or len(Version.strip()) == 0:
            Version = 'N/A'
-        
+
        if DpGuid is None or len(DpGuid.strip()) == 0:
            DpGuid = 'N/A'
-        
+
        if DpVersion is None or len(DpVersion.strip()) == 0:
            DpVersion = 'N/A'
-        
+
        #
        # Add newly installed package information to DB.
        #
@@ -312,10 +312,10 @@ class IpiDatabase(object):
        """insert into %s values('%s', '%s', %s, '%s', '%s', '%s')""" % \
        (self.PkgTable, Guid, Version, CurrentTime, DpGuid, DpVersion, Path)
        self.Cur.execute(SqlCommand)
-        
+
    ## Add a module that from a package install information
    #
-    # @param Guid:    Module Guid 
+    # @param Guid:    Module Guid
    # @param Version: Module version
    # @param Name:    Module Name
    # @param PkgGuid: Package Guid
@@ -324,21 +324,21 @@ class IpiDatabase(object):
    #
    def _AddModuleInPackage(self, Guid, Version, Name, PkgGuid=None, \
                            PkgVersion=None, Path=''):
-        
+
        if Version is None or len(Version.strip()) == 0:
            Version = 'N/A'
-        
+
        if PkgGuid is None or len(PkgGuid.strip()) == 0:
            PkgGuid = 'N/A'
-        
+
        if PkgVersion is None or len(PkgVersion.strip()) == 0:
            PkgVersion = 'N/A'
-            
+
        if os.name == 'posix':
            Path = Path.replace('\\', os.sep)
        else:
            Path = Path.replace('/', os.sep)
-        
+
        #
        # Add module from package information to DB.
        #
@@ -348,7 +348,7 @@ class IpiDatabase(object):
        (self.ModInPkgTable, Guid, Version, Name, CurrentTime, PkgGuid, PkgVersion, \
         Path)
        self.Cur.execute(SqlCommand)
-    
+
    ## Add a module that is standalone install information
    #
    # @param Guid: a module Guid
@@ -360,16 +360,16 @@ class IpiDatabase(object):
    #
    def _AddStandaloneModule(self, Guid, Version, Name, DpGuid=None, \
                             DpVersion=None, Path=''):
-        
+
        if Version is None or len(Version.strip()) == 0:
            Version = 'N/A'
-        
+
        if DpGuid is None or len(DpGuid.strip()) == 0:
            DpGuid = 'N/A'
-        
+
        if DpVersion is None or len(DpVersion.strip()) == 0:
            DpVersion = 'N/A'
-        
+
        #
        # Add module standalone information to DB.
        #
@@ -379,7 +379,7 @@ class IpiDatabase(object):
        (self.StandaloneModTable, Guid, Version, Name, CurrentTime, DpGuid, \
         DpVersion, Path)
        self.Cur.execute(SqlCommand)
-    
+
    ## Add a module depex
    #
    # @param Guid: a module Guid
@@ -390,49 +390,49 @@ class IpiDatabase(object):
    #
    def _AddModuleDepex(self, Guid, Version, Name, Path, DepexGuid=None, \
                        DepexVersion=None):
-                
+
        if DepexGuid is None or len(DepexGuid.strip()) == 0:
            DepexGuid = 'N/A'
-        
+
        if DepexVersion is None or len(DepexVersion.strip()) == 0:
            DepexVersion = 'N/A'
-            
+
        if os.name == 'posix':
            Path = Path.replace('\\', os.sep)
        else:
            Path = Path.replace('/', os.sep)
-        
+
        #
        # Add module depex information to DB.
        #
        SqlCommand = """insert into %s values('%s', '%s', '%s', '%s', '%s', '%s')"""\
         % (self.ModDepexTable, Guid, Version, Name, Path, DepexGuid, DepexVersion)
        self.Cur.execute(SqlCommand)
-        
-    ## Remove a distribution install information, if no version specified, 
+
+    ## Remove a distribution install information, if no version specified,
    # remove all DPs with this Guid.
    #
-    # @param DpGuid: guid of dpex 
+    # @param DpGuid: guid of dpex
    # @param DpVersion: version of dpex
    #
    def RemoveDpObj(self, DpGuid, DpVersion):
-        
+
        PkgList = self.GetPackageListFromDp(DpGuid, DpVersion)
        #
        # delete from ModDepex the standalone module's dependency
        #
        SqlCommand = \
-        """delete from ModDepexInfo where ModDepexInfo.ModuleGuid in 
-        (select ModuleGuid from StandaloneModInfo as B where B.DpGuid = '%s' 
+        """delete from ModDepexInfo where ModDepexInfo.ModuleGuid in
+        (select ModuleGuid from StandaloneModInfo as B where B.DpGuid = '%s'
        and B.DpVersion = '%s')
        and ModDepexInfo.ModuleVersion in
-        (select ModuleVersion from StandaloneModInfo as B 
+        (select ModuleVersion from StandaloneModInfo as B
        where B.DpGuid = '%s' and B.DpVersion = '%s')
        and ModDepexInfo.ModuleName in
-        (select ModuleName from StandaloneModInfo as B 
+        (select ModuleName from StandaloneModInfo as B
        where B.DpGuid = '%s' and B.DpVersion = '%s')
        and ModDepexInfo.InstallPath in
-        (select InstallPath from StandaloneModInfo as B 
+        (select InstallPath from StandaloneModInfo as B
        where B.DpGuid = '%s' and B.DpVersion = '%s') """ % \
        (DpGuid, DpVersion, DpGuid, DpVersion, DpGuid, DpVersion, DpGuid, DpVersion)

@@ -443,24 +443,24 @@ class IpiDatabase(object):
        for Pkg in PkgList:

            SqlCommand = \
-            """delete from ModDepexInfo where ModDepexInfo.ModuleGuid in 
-            (select ModuleGuid from ModInPkgInfo 
-            where ModInPkgInfo.PackageGuid ='%s' and 
+            """delete from ModDepexInfo where ModDepexInfo.ModuleGuid in
+            (select ModuleGuid from ModInPkgInfo
+            where ModInPkgInfo.PackageGuid ='%s' and
            ModInPkgInfo.PackageVersion = '%s')
            and ModDepexInfo.ModuleVersion in
-            (select ModuleVersion from ModInPkgInfo 
-            where ModInPkgInfo.PackageGuid ='%s' and 
+            (select ModuleVersion from ModInPkgInfo
+            where ModInPkgInfo.PackageGuid ='%s' and
            ModInPkgInfo.PackageVersion = '%s')
            and ModDepexInfo.ModuleName in
-            (select ModuleName from ModInPkgInfo 
-            where ModInPkgInfo.PackageGuid ='%s' and 
+            (select ModuleName from ModInPkgInfo
+            where ModInPkgInfo.PackageGuid ='%s' and
            ModInPkgInfo.PackageVersion = '%s')
            and ModDepexInfo.InstallPath in
-            (select InstallPath from ModInPkgInfo where 
-            ModInPkgInfo.PackageGuid ='%s' 
+            (select InstallPath from ModInPkgInfo where
+            ModInPkgInfo.PackageGuid ='%s'
            and ModInPkgInfo.PackageVersion = '%s')""" \
                            % (Pkg[0], Pkg[1], Pkg[0], Pkg[1], Pkg[0], Pkg[1], Pkg[0], Pkg[1])
-            
+
            self.Cur.execute(SqlCommand)
        #
        # delete the standalone module
@@ -474,7 +474,7 @@ class IpiDatabase(object):
        #
        for Pkg in PkgList:
            SqlCommand = \
-            """delete from %s where %s.PackageGuid ='%s' 
+            """delete from %s where %s.PackageGuid ='%s'
            and %s.PackageVersion = '%s'""" % \
            (self.ModInPkgTable, self.ModInPkgTable, Pkg[0], \
             self.ModInPkgTable, Pkg[1])
@@ -493,23 +493,23 @@ class IpiDatabase(object):
        """delete from %s where DpGuid ='%s' and DpVersion = '%s'""" % \
        (self.DpFileListTable, DpGuid, DpVersion)
        self.Cur.execute(SqlCommand)
-        #    
+        #
        # delete DP
        #
        SqlCommand = \
        """delete from %s where DpGuid ='%s' and DpVersion = '%s'""" % \
        (self.DpTable, DpGuid, DpVersion)
        self.Cur.execute(SqlCommand)
-        
+
        #self.Conn.commit()
-        
+
    ## Get a list of distribution install information.
    #
-    # @param Guid: distribution package guid  
-    # @param Version: distribution package version 
+    # @param Guid: distribution package guid
+    # @param Version: distribution package version
    #
    def GetDp(self, Guid, Version):
-        
+
        if Version is None or len(Version.strip()) == 0:
            Version = 'N/A'
            Logger.Verbose(ST.MSG_GET_DP_INSTALL_LIST)
@@ -517,7 +517,7 @@ class IpiDatabase(object):
            SqlCommand = """select * from %s where DpGuid ='%s'""" % \
            (self.DpTable, DpGuid)
            self.Cur.execute(SqlCommand)
-        
+
        else:
            Logger.Verbose(ST.MSG_GET_DP_INSTALL_INFO_START)
            (DpGuid, DpVersion) = (Guid, Version)
@@ -533,14 +533,14 @@ class IpiDatabase(object):
            InstallTime = DpInfo[2]
            PkgFileName = DpInfo[3]
            DpList.append((DpGuid, DpVersion, InstallTime, PkgFileName))
-            
-        Logger.Verbose(ST.MSG_GET_DP_INSTALL_INFO_FINISH)    
+
+        Logger.Verbose(ST.MSG_GET_DP_INSTALL_INFO_FINISH)
        return DpList
-    
+
    ## Get a list of distribution install dirs
    #
-    # @param Guid: distribution package guid 
-    # @param Version: distribution package version 
+    # @param Guid: distribution package guid
+    # @param Version: distribution package version
    #
    def GetDpInstallDirList(self, Guid, Version):
        SqlCommand = """select InstallPath from PkgInfo where DpGuid = '%s' and DpVersion = '%s'""" % (Guid, Version)
@@ -562,11 +562,11 @@ class IpiDatabase(object):

    ## Get a list of distribution install file path information.
    #
-    # @param Guid: distribution package guid 
-    # @param Version: distribution package version 
+    # @param Guid: distribution package guid
+    # @param Version: distribution package version
    #
    def GetDpFileList(self, Guid, Version):
-        
+
        (DpGuid, DpVersion) = (Guid, Version)
        SqlCommand = \
        """select * from %s where DpGuid ='%s' and DpVersion = '%s'""" % \
@@ -578,7 +578,7 @@ class IpiDatabase(object):
            Path = Result[0]
            Md5Sum = Result[3]
            PathList.append((os.path.join(self.Workspace, Path), Md5Sum))
-        
+
        return PathList

    ## Get files' repackage attribute if present that are installed into current workspace
@@ -588,12 +588,12 @@ class IpiDatabase(object):
    def GetRePkgDict(self):
        SqlCommand = """select * from %s """ % (self.DpTable)
        self.Cur.execute(SqlCommand)
-        
+
        DpInfoList = []
        for Result in self.Cur:
            DpInfoList.append(Result)

-        FileDict = {}        
+        FileDict = {}
        for Result in DpInfoList:
            DpGuid = Result[0]
            DpVersion = Result[1]
@@ -606,12 +606,12 @@ class IpiDatabase(object):
            for FileInfo in self.GetDpFileList(DpGuid, DpVersion):
                PathInfo = FileInfo[0]
                FileDict[PathInfo] = DpGuid, DpVersion, NewDpFileName, RePackage
-                
+
        return FileDict
-    
+
    ## Get (Guid, Version) from distribution file name information.
    #
-    # @param DistributionFile: Distribution File  
+    # @param DistributionFile: Distribution File
    #
    def GetDpByName(self, DistributionFile):
        SqlCommand = """select * from %s where NewPkgFileName = '%s'""" % \
@@ -622,34 +622,34 @@ class IpiDatabase(object):
            DpGuid = Result[0]
            DpVersion = Result[1]
            NewDpFileName = Result[3]
-   
+
            return (DpGuid, DpVersion, NewDpFileName)
        else:
            return (None, None, None)
-        
+
    ## Get a list of package information.
    #
-    # @param Guid: package guid  
+    # @param Guid: package guid
    # @param Version: package version
    #
    def GetPackage(self, Guid, Version, DpGuid='', DpVersion=''):
-        
+
        if DpVersion == '' or DpGuid == '':

            (PackageGuid, PackageVersion) = (Guid, Version)
-            SqlCommand = """select * from %s where PackageGuid ='%s' 
+            SqlCommand = """select * from %s where PackageGuid ='%s'
            and PackageVersion = '%s'""" % (self.PkgTable, PackageGuid, \
                                            PackageVersion)
            self.Cur.execute(SqlCommand)
-        
+
        elif Version is None or len(Version.strip()) == 0:
-            
+
            SqlCommand = """select * from %s where PackageGuid ='%s'""" % \
            (self.PkgTable, Guid)
            self.Cur.execute(SqlCommand)
        else:
            (PackageGuid, PackageVersion) = (Guid, Version)
-            SqlCommand = """select * from %s where PackageGuid ='%s' and 
+            SqlCommand = """select * from %s where PackageGuid ='%s' and
            PackageVersion = '%s'
                            and DpGuid = '%s' and DpVersion = '%s'""" % \
                            (self.PkgTable, PackageGuid, PackageVersion, \
@@ -664,10 +664,10 @@ class IpiDatabase(object):
            InstallPath = PkgInfo[5]
            PkgList.append((PkgGuid, PkgVersion, InstallTime, DpGuid, \
                            DpVersion, InstallPath))
-        
+
        return PkgList
- 
-       
+
+
    ## Get a list of module in package information.
    #
    # @param Guid: A module guid
@@ -676,15 +676,15 @@ class IpiDatabase(object):
    def GetModInPackage(self, Guid, Version, Name, Path, PkgGuid='', PkgVersion=''):
        (ModuleGuid, ModuleVersion, ModuleName, InstallPath) = (Guid, Version, Name, Path)
        if PkgVersion == '' or PkgGuid == '':
-            SqlCommand = """select * from %s where ModuleGuid ='%s' and 
-            ModuleVersion = '%s' and InstallPath = '%s' 
+            SqlCommand = """select * from %s where ModuleGuid ='%s' and
+            ModuleVersion = '%s' and InstallPath = '%s'
            and ModuleName = '%s'""" % (self.ModInPkgTable, ModuleGuid, \
                                       ModuleVersion, InstallPath, ModuleName)
            self.Cur.execute(SqlCommand)
        else:
-            SqlCommand = """select * from %s where ModuleGuid ='%s' and 
-            ModuleVersion = '%s' and InstallPath = '%s' 
-            and ModuleName = '%s' and PackageGuid ='%s' 
+            SqlCommand = """select * from %s where ModuleGuid ='%s' and
+            ModuleVersion = '%s' and InstallPath = '%s'
+            and ModuleName = '%s' and PackageGuid ='%s'
            and PackageVersion = '%s'
                            """ % (self.ModInPkgTable, ModuleGuid, \
                                   ModuleVersion, InstallPath, ModuleName, PkgGuid, PkgVersion)
@@ -698,26 +698,26 @@ class IpiDatabase(object):
            InstallPath = ModInfo[5]
            ModList.append((ModGuid, ModVersion, InstallTime, PkgGuid, \
                            PkgVersion, InstallPath))
-        
+
        return ModList
-    
+
    ## Get a list of module standalone.
    #
-    # @param Guid: A module guid 
-    # @param Version: A module version 
+    # @param Guid: A module guid
+    # @param Version: A module version
    #
    def GetStandaloneModule(self, Guid, Version, Name, Path, DpGuid='', DpVersion=''):
        (ModuleGuid, ModuleVersion, ModuleName, InstallPath) = (Guid, Version, Name, Path)
        if DpGuid == '':
-            SqlCommand = """select * from %s where ModuleGuid ='%s' and 
-            ModuleVersion = '%s' and InstallPath = '%s' 
+            SqlCommand = """select * from %s where ModuleGuid ='%s' and
+            ModuleVersion = '%s' and InstallPath = '%s'
            and ModuleName = '%s'""" % (self.StandaloneModTable, ModuleGuid, \
                                       ModuleVersion, InstallPath, ModuleName)
            self.Cur.execute(SqlCommand)
-        
+
        else:
-            SqlCommand = """select * from %s where ModuleGuid ='%s' and 
-            ModuleVersion = '%s' and InstallPath = '%s' and ModuleName = '%s' and DpGuid ='%s' and DpVersion = '%s' 
+            SqlCommand = """select * from %s where ModuleGuid ='%s' and
+            ModuleVersion = '%s' and InstallPath = '%s' and ModuleName = '%s' and DpGuid ='%s' and DpVersion = '%s'
                            """ % (self.StandaloneModTable, ModuleGuid, \
                                   ModuleVersion, ModuleName, InstallPath, DpGuid, DpVersion)
            self.Cur.execute(SqlCommand)
@@ -730,18 +730,18 @@ class IpiDatabase(object):
            InstallPath = ModInfo[5]
            ModList.append((ModGuid, ModVersion, InstallTime, DpGuid, \
                            DpVersion, InstallPath))
-        
+
        return ModList
-    
+
    ## Get a list of module information that comes from DP.
    #
-    # @param DpGuid: A Distrabution Guid 
-    # @param DpVersion: A Distrabution version  
+    # @param DpGuid: A Distrabution Guid
+    # @param DpVersion: A Distrabution version
    #
    def GetSModInsPathListFromDp(self, DpGuid, DpVersion):

        PathList = []
-        SqlCommand = """select InstallPath from %s where DpGuid ='%s' 
+        SqlCommand = """select InstallPath from %s where DpGuid ='%s'
        and DpVersion = '%s'
                        """ % (self.StandaloneModTable, DpGuid, DpVersion)
        self.Cur.execute(SqlCommand)
@@ -749,17 +749,17 @@ class IpiDatabase(object):
        for Result in self.Cur:
            InstallPath = Result[0]
            PathList.append(InstallPath)
-        
+
        return PathList
-    
+
    ## Get a list of package information.
    #
-    # @param DpGuid: A Distrabution Guid 
-    # @param DpVersion: A Distrabution version 
+    # @param DpGuid: A Distrabution Guid
+    # @param DpVersion: A Distrabution version
    #
    def GetPackageListFromDp(self, DpGuid, DpVersion):

-        SqlCommand = """select * from %s where DpGuid ='%s' and 
+        SqlCommand = """select * from %s where DpGuid ='%s' and
        DpVersion = '%s' """ % (self.PkgTable, DpGuid, DpVersion)
        self.Cur.execute(SqlCommand)

@@ -769,31 +769,31 @@ class IpiDatabase(object):
            PkgVersion = PkgInfo[1]
            InstallPath = PkgInfo[5]
            PkgList.append((PkgGuid, PkgVersion, InstallPath))
-        
+
        return PkgList
-    
+
    ## Get a list of modules that depends on package information from a DP.
    #
-    # @param DpGuid: A Distrabution Guid 
-    # @param DpVersion: A Distrabution version 
+    # @param DpGuid: A Distrabution Guid
+    # @param DpVersion: A Distrabution version
    #
    def GetDpDependentModuleList(self, DpGuid, DpVersion):
-        
+
        ModList = []
        PkgList = self.GetPackageListFromDp(DpGuid, DpVersion)
        if len(PkgList) > 0:
            return ModList
-        
+
        for Pkg in PkgList:
            #
-            # get all in-package modules that depends on current 
-            # Pkg (Guid match, Version match or NA) but not belong to 
+            # get all in-package modules that depends on current
+            # Pkg (Guid match, Version match or NA) but not belong to
            # current Pkg
            #
-            SqlCommand = """select t1.ModuleGuid, t1.ModuleVersion, 
-            t1.InstallPath from %s as t1, %s as t2 where 
-            t1.ModuleGuid = t2.ModuleGuid and 
-            t1.ModuleVersion = t2.ModuleVersion and t2.DepexGuid ='%s' 
+            SqlCommand = """select t1.ModuleGuid, t1.ModuleVersion,
+            t1.InstallPath from %s as t1, %s as t2 where
+            t1.ModuleGuid = t2.ModuleGuid and
+            t1.ModuleVersion = t2.ModuleVersion and t2.DepexGuid ='%s'
            and (t2.DepexVersion = '%s' or t2.DepexVersion = 'N/A') and
            t1.PackageGuid != '%s' and t1.PackageVersion != '%s'
                        """ % (self.ModInPkgTable, \
@@ -807,13 +807,13 @@ class IpiDatabase(object):
                ModList.append((ModGuid, ModVersion, InstallPath))

            #
-            # get all modules from standalone modules that depends on current 
+            # get all modules from standalone modules that depends on current
            #Pkg (Guid match, Version match or NA) but not in current dp
            #
            SqlCommand = \
-            """select t1.ModuleGuid, t1.ModuleVersion, t1.InstallPath 
-            from %s as t1, %s as t2 where t1.ModuleGuid = t2.ModuleGuid and 
-            t1.ModuleVersion = t2.ModuleVersion and t2.DepexGuid ='%s' 
+            """select t1.ModuleGuid, t1.ModuleVersion, t1.InstallPath
+            from %s as t1, %s as t2 where t1.ModuleGuid = t2.ModuleGuid and
+            t1.ModuleVersion = t2.ModuleVersion and t2.DepexGuid ='%s'
            and (t2.DepexVersion = '%s' or t2.DepexVersion = 'N/A') and
                            t1.DpGuid != '%s' and t1.DpVersion != '%s'
                        """ % \
@@ -825,75 +825,75 @@ class IpiDatabase(object):
                ModVersion = ModInfo[1]
                InstallPath = ModInfo[2]
                ModList.append((ModGuid, ModVersion, InstallPath))
-        
-        
+
+
        return ModList

    ## Get Dp's list of modules.
    #
-    # @param DpGuid: A Distrabution Guid 
-    # @param DpVersion: A Distrabution version 
+    # @param DpGuid: A Distrabution Guid
+    # @param DpVersion: A Distrabution version
    #
-    def GetDpModuleList(self, DpGuid, DpVersion):      
+    def GetDpModuleList(self, DpGuid, DpVersion):
        ModList = []
        #
        # get Dp module list from the DpFileList table
        #
-        SqlCommand = """select FilePath 
+        SqlCommand = """select FilePath
                        from %s
-                        where DpGuid = '%s' and DpVersion = '%s' and 
+                        where DpGuid = '%s' and DpVersion = '%s' and
                        FilePath like '%%.inf'
                    """ % (self.DpFileListTable, DpGuid, DpVersion)
        self.Cur.execute(SqlCommand)
        for ModuleInfo in self.Cur:
            FilePath = ModuleInfo[0]
            ModList.append(os.path.join(self.Workspace, FilePath))
-            
-        return ModList        

-        
+        return ModList
+
+
    ## Get a module depex
    #
-    # @param DpGuid: A module Guid 
-    # @param DpVersion: A module version 
+    # @param DpGuid: A module Guid
+    # @param DpVersion: A module version
    # @param Path:
    #
    def GetModuleDepex(self, Guid, Version, Path):
-                
+
        #
        # Get module depex information to DB.
        #
-        SqlCommand = """select * from %s where ModuleGuid ='%s' and 
+        SqlCommand = """select * from %s where ModuleGuid ='%s' and
        ModuleVersion = '%s' and InstallPath ='%s'
                            """ % (self.ModDepexTable, Guid, Version, Path)
        self.Cur.execute(SqlCommand)

-        
+
        DepexList = []
        for DepInfo in self.Cur:
            DepexGuid = DepInfo[3]
            DepexVersion = DepInfo[4]
            DepexList.append((DepexGuid, DepexVersion))
-        
+
        return DepexList
- 
+
    ## Inventory the distribution installed to current workspace
    #
    # Inventory the distribution installed to current workspace
-    #   
+    #
    def InventoryDistInstalled(self):
        SqlCommand = """select * from %s """ % (self.DpTable)
        self.Cur.execute(SqlCommand)
-        
+
        DpInfoList = []
        for Result in self.Cur:
            DpGuid = Result[0]
            DpVersion = Result[1]
            DpAliasName = Result[3]
-            DpFileName = Result[4]            
+            DpFileName = Result[4]
            DpInfoList.append((DpGuid, DpVersion, DpFileName, DpAliasName))
-        
-        return DpInfoList     
+
+        return DpInfoList

    ## Close entire database
    #
@@ -904,18 +904,18 @@ class IpiDatabase(object):
        # drop the dummy table
        #
        SqlCommand = """
-        drop table IF EXISTS %s 
+        drop table IF EXISTS %s
        """ % self.DummyTable
        self.Cur.execute(SqlCommand)
        self.Conn.commit()
-        
+
        self.Cur.close()
        self.Conn.close()

    ## Convert To Sql String
    #
    # 1. Replace "'" with "''" in each item of StringList
-    # 
+    #
    # @param StringList:  A list for strings to be converted
    #
    def __ConvertToSqlString(self, StringList):
@@ -925,4 +925,4 @@ class IpiDatabase(object):



-    
+
--- a/BaseTools/Source/Python/UPT/Core/PackageFile.py
+++ b/BaseTools/Source/Python/UPT/Core/PackageFile.py
@@ -2,11 +2,11 @@
 #
 # PackageFile class represents the zip file of a distribution package.
 #
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available 
-# under the terms and conditions of the BSD License which accompanies this 
-# distribution. The full text of the license may be found at 
+# This program and the accompanying materials are licensed and made available
+# under the terms and conditions of the BSD License which accompanies this
+# distribution. The full text of the license may be found at
 # http://opensource.org/licenses/bsd-license.php
 #
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
@@ -52,25 +52,25 @@ class PackageFile:
            for Filename in self._ZipFile.namelist():
                self._Files[os.path.normpath(Filename)] = Filename
        except BaseException as Xstr:
-            Logger.Error("PackagingTool", FILE_OPEN_FAILURE, 
+            Logger.Error("PackagingTool", FILE_OPEN_FAILURE,
                            ExtraData="%s (%s)" % (FileName, str(Xstr)))

        BadFile = self._ZipFile.testzip()
        if BadFile is not None:
-            Logger.Error("PackagingTool", FILE_CHECKSUM_FAILURE, 
+            Logger.Error("PackagingTool", FILE_CHECKSUM_FAILURE,
                            ExtraData="[%s] in %s" % (BadFile, FileName))
-    
+
    def GetZipFile(self):
        return self._ZipFile
-    
-    ## Get file name 
+
+    ## Get file name
    #
    def __str__(self):
        return self._FileName
-    
+
    ## Extract the file
-    # 
-    # @param To:  the destination file 
+    #
+    # @param To:  the destination file
    #
    def Unpack(self, ToDest):
        for FileN in self._ZipFile.namelist():
@@ -78,11 +78,11 @@ class PackageFile:
            Msg = "%s -> %s" % (FileN, ToFile)
            Logger.Info(Msg)
            self.Extract(FileN, ToFile)
-    
+
    ## Extract the file
-    # 
-    # @param File:  the extracted file 
-    # @param ToFile:  the destination file 
+    #
+    # @param File:  the extracted file
+    # @param ToFile:  the destination file
    #
    def UnpackFile(self, File, ToFile):
        File = File.replace('\\', '/')
@@ -91,13 +91,13 @@ class PackageFile:
            Logger.Info(Msg)
            self.Extract(File, ToFile)
            return ToFile
-        
+
        return ''
-    
+
    ## Extract the file
-    # 
-    # @param Which:  the source path 
-    # @param ToDest:  the destination path 
+    #
+    # @param Which:  the source path
+    # @param ToDest:  the destination path
    #
    def Extract(self, Which, ToDest):
        Which = os.path.normpath(Which)
@@ -107,7 +107,7 @@ class PackageFile:
        try:
            FileContent = self._ZipFile.read(self._Files[Which])
        except BaseException as Xstr:
-            Logger.Error("PackagingTool", FILE_DECOMPRESS_FAILURE, 
+            Logger.Error("PackagingTool", FILE_DECOMPRESS_FAILURE,
                            ExtraData="[%s] in %s (%s)" % (Which, \
                                                           self._FileName, \
                                                           str(Xstr)))
@@ -120,19 +120,19 @@ class PackageFile:
            else:
                ToFile = __FileHookOpen__(ToDest, 'wb')
        except BaseException as Xstr:
-            Logger.Error("PackagingTool", FILE_OPEN_FAILURE, 
+            Logger.Error("PackagingTool", FILE_OPEN_FAILURE,
                            ExtraData="%s (%s)" % (ToDest, str(Xstr)))

        try:
            ToFile.write(FileContent)
            ToFile.close()
        except BaseException as Xstr:
-            Logger.Error("PackagingTool", FILE_WRITE_FAILURE, 
+            Logger.Error("PackagingTool", FILE_WRITE_FAILURE,
                            ExtraData="%s (%s)" % (ToDest, str(Xstr)))

    ## Remove the file
-    # 
-    # @param Files:  the removed files 
+    #
+    # @param Files:  the removed files
    #
    def Remove(self, Files):
        TmpDir = os.path.join(tempfile.gettempdir(), ".packaging")
@@ -144,7 +144,7 @@ class PackageFile:
        for SinF in Files:
            SinF = os.path.normpath(SinF)
            if SinF not in self._Files:
-                Logger.Error("PackagingTool", FILE_NOT_FOUND, 
+                Logger.Error("PackagingTool", FILE_NOT_FOUND,
                                ExtraData="%s is not in %s!" % \
                                (SinF, self._FileName))
            self._Files.pop(SinF)
@@ -159,12 +159,12 @@ class PackageFile:
        RemoveDirectory(TmpDir, True)

    ## Pack the files under Top directory, the directory shown in the zipFile start from BaseDir,
-    # BaseDir should be the parent directory of the Top directory, for example, 
-    # Pack(Workspace\Dir1, Workspace) will pack files under Dir1, and the path in the zipfile will 
+    # BaseDir should be the parent directory of the Top directory, for example,
+    # Pack(Workspace\Dir1, Workspace) will pack files under Dir1, and the path in the zipfile will
    # start from Workspace
-    # 
-    # @param Top:  the top directory 
-    # @param BaseDir:  the base directory 
+    #
+    # @param Top:  the top directory
+    # @param BaseDir:  the base directory
    #
    def Pack(self, Top, BaseDir):
        if not os.path.isdir(Top):
@@ -175,14 +175,14 @@ class PackageFile:
        Cwd = os.getcwd()
        os.chdir(BaseDir)
        RelaDir = Top[Top.upper().find(BaseDir.upper()).\
-                      join(len(BaseDir).join(1)):] 
+                      join(len(BaseDir).join(1)):]

        for Root, Dirs, Files in os.walk(RelaDir):
            if 'CVS' in Dirs:
                Dirs.remove('CVS')
            if '.svn' in Dirs:
                Dirs.remove('.svn')
-            
+
            for Dir in Dirs:
                if Dir.startswith('.'):
                    Dirs.remove(Dir)
@@ -200,8 +200,8 @@ class PackageFile:
        os.chdir(Cwd)

    ## Pack the file
-    # 
-    # @param Files:  the files to pack 
+    #
+    # @param Files:  the files to pack
    #
    def PackFiles(self, Files):
        for File in Files:
@@ -211,9 +211,9 @@ class PackageFile:
            os.chdir(Cwd)

    ## Pack the file
-    # 
-    # @param File:  the files to pack 
-    # @param ArcName:  the Arc Name 
+    #
+    # @param File:  the files to pack
+    # @param ArcName:  the Arc Name
    #
    def PackFile(self, File, ArcName=None):
        try:
@@ -221,7 +221,7 @@ class PackageFile:
            # avoid packing same file multiple times
            #
            if platform.system() != 'Windows':
-                File = File.replace('\\', '/')            
+                File = File.replace('\\', '/')
            ZipedFilesNameList = self._ZipFile.namelist()
            for ZipedFile in ZipedFilesNameList:
                if File == os.path.normpath(ZipedFile):
@@ -233,9 +233,9 @@ class PackageFile:
                            ExtraData="%s (%s)" % (File, str(Xstr)))

    ## Write data to the packed file
-    # 
-    # @param Data:  data to write 
-    # @param ArcName:  the Arc Name 
+    #
+    # @param Data:  data to write
+    # @param ArcName:  the Arc Name
    #
    def PackData(self, Data, ArcName):
        try:
@@ -247,7 +247,7 @@ class PackageFile:
                            ExtraData="%s (%s)" % (ArcName, str(Xstr)))

    ## Close file
-    # 
+    #
    #
    def Close(self):
        self._ZipFile.close()
--- a/BaseTools/Source/Python/UPT/Core/init.py
+++ b/BaseTools/Source/Python/UPT/Core/init.py
@@ -4,11 +4,11 @@
 # This file is required to make Python interpreter treat the directory
 # as containing package.
 #
-# Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available 
-# under the terms and conditions of the BSD License which accompanies this 
-# distribution. The full text of the license may be found at 
+# This program and the accompanying materials are licensed and made available
+# under the terms and conditions of the BSD License which accompanies this
+# distribution. The full text of the license may be found at
 # http://opensource.org/licenses/bsd-license.php
 #
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
@@ -17,4 +17,4 @@

 '''
 Core init file
-'''
+'''