BaseTools: Remove equality operator with None

[mirror_edk2.git] / BaseTools / Source / Python / UPT / Core / PackageFile.py

diff --git a/BaseTools/Source/Python/UPT/Core/PackageFile.py b/BaseTools/Source/Python/UPT/Core/PackageFile.py
index 47ea0bc0a932ef618a08f3ade08e821986b91c0f..ec6f5503eaad39756894c329f87432e763d17475 100644 (file)
--- a/BaseTools/Source/Python/UPT/Core/PackageFile.py
+++ b/BaseTools/Source/Python/UPT/Core/PackageFile.py
@@ -37,6 +37,7 @@ from Logger import StringTable as ST
 from Library.Misc import CreateDirectory\r
 from Library.Misc import RemoveDirectory\r
 from Core.FileHook import __FileHookOpen__\r
+from Common.MultipleWorkspace import MultipleWorkspace as mws\r
 \r
 \r
 class PackageFile:\r
@@ -55,7 +56,7 @@ class PackageFile:
                             ExtraData="%s (%s)" % (FileName, str(Xstr)))\r
 \r
         BadFile = self._ZipFile.testzip()\r
-        if BadFile != None:\r
+        if BadFile is not None:\r
             Logger.Error("PackagingTool", FILE_CHECKSUM_FAILURE, \r
                             ExtraData="[%s] in %s" % (BadFile, FileName))\r
     \r
@@ -203,8 +204,11 @@ class PackageFile:
     # @param Files:  the files to pack \r
     #\r
     def PackFiles(self, Files):\r
-        for File1 in Files:\r
-            self.PackFile(File1)\r
+        for File in Files:\r
+            Cwd = os.getcwd()\r
+            os.chdir(mws.getWs(mws.WORKSPACE, File))\r
+            self.PackFile(File)\r
+            os.chdir(Cwd)\r
 \r
     ## Pack the file\r
     # \r