BaseTools:Update mailing list address in BaseTools error messages

[mirror_edk2.git] / BaseTools / Source / Python / UPT / InstallPkg.py

diff --git a/BaseTools/Source/Python/UPT/InstallPkg.py b/BaseTools/Source/Python/UPT/InstallPkg.py
index 3573886d5ab394ecc8fa4dcbaea021de470bbd42..e4c7565441ba1726066fc6c23ca13a01987d945a 100644 (file)
--- a/BaseTools/Source/Python/UPT/InstallPkg.py
+++ b/BaseTools/Source/Python/UPT/InstallPkg.py
@@ -3,13 +3,7 @@
 #\r
 # Copyright (c) 2011 - 2018, 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
-# distribution. The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 """\r
 Install a distribution package\r
@@ -23,7 +17,7 @@ from os import chmod
 from os import SEEK_SET\r
 from os import SEEK_END\r
 import stat\r
-import md5\r
+from hashlib import md5\r
 import copy\r
 from sys import stdin\r
 from sys import platform\r
@@ -176,8 +170,8 @@ def UnZipDp(WorkspaceDir, DpPkgFileName, Index=1):
     # verify MD5 signature when existed\r
     #\r
     if DistPkg.Header.Signature != '':\r
-        Md5Sigature = md5.new(__FileHookOpen__(ContentFile, 'rb').read())\r
-        if DistPkg.Header.Signature != Md5Sigature.hexdigest():\r
+        Md5Signature = md5(__FileHookOpen__(ContentFile, 'rb').read())\r
+        if DistPkg.Header.Signature != Md5Signature.hexdigest():\r
             ContentZipFile.Close()\r
             Logger.Error("InstallPkg", FILE_CHECKSUM_FAILURE,\r
                 ExtraData=ContentFile)\r
@@ -215,8 +209,8 @@ def GetPackageList(DistPkg, Dep, WorkspaceDir, Options, ContentZipFile, ModuleLi
     #\r
     for Package in PackageList:\r
         FilePath = PackageToDec(Package, DistPkg.Header)\r
-        Md5Sigature = md5.new(__FileHookOpen__(str(FilePath), 'rb').read())\r
-        Md5Sum = Md5Sigature.hexdigest()\r
+        Md5Signature = md5(__FileHookOpen__(str(FilePath), 'rb').read())\r
+        Md5Sum = Md5Signature.hexdigest()\r
         if (FilePath, Md5Sum) not in Package.FileList:\r
             Package.FileList.append((FilePath, Md5Sum))\r
 \r
@@ -275,8 +269,8 @@ def GetModuleList(DistPkg, Dep, WorkspaceDir, ContentZipFile, ModuleList):
     for (Module, Package) in ModuleList:\r
         CheckCNameInModuleRedefined(Module, DistPkg)\r
         FilePath = ModuleToInf(Module, Package, DistPkg.Header)\r
-        Md5Sigature = md5.new(__FileHookOpen__(str(FilePath), 'rb').read())\r
-        Md5Sum = Md5Sigature.hexdigest()\r
+        Md5Signature = md5(__FileHookOpen__(str(FilePath), 'rb').read())\r
+        Md5Sum = Md5Signature.hexdigest()\r
         if Package:\r
             if (FilePath, Md5Sum) not in Package.FileList:\r
                 Package.FileList.append((FilePath, Md5Sum))\r
@@ -553,7 +547,7 @@ def Main(Options = None):
                     "\nInstallPkg",\r
                     CODE_ERROR,\r
                     ST.ERR_UNKNOWN_FATAL_INSTALL_ERR % Options.PackageFile,\r
-                    ExtraData=ST.MSG_SEARCH_FOR_HELP,\r
+                    ExtraData=ST.MSG_SEARCH_FOR_HELP % ST.MSG_EDKII_MAIL_ADDR,\r
                     RaiseError=False\r
                     )\r
         Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(),\r
@@ -803,8 +797,8 @@ def InstallFile(ContentZipFile, FromFile, ToFile, ReadOnly, Executable=False):
         else:\r
             chmod(ToFile, stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH | stat.S_IWUSR | stat.S_IWGRP | stat.S_IWOTH)\r
 \r
-    Md5Sigature = md5.new(__FileHookOpen__(str(ToFile), 'rb').read())\r
-    Md5Sum = Md5Sigature.hexdigest()\r
+    Md5Signature = md5(__FileHookOpen__(str(ToFile), 'rb').read())\r
+    Md5Sum = Md5Signature.hexdigest()\r
 \r
     return Md5Sum\r
 \r
@@ -876,8 +870,8 @@ def InstallPackageContent(FromPath, ToPath, Package, ContentZipFile, Dep,
             chmod(ToFile, stat.S_IRUSR|stat.S_IRGRP|stat.S_IROTH)\r
         else:\r
             chmod(ToFile, stat.S_IRUSR|stat.S_IRGRP|stat.S_IROTH|stat.S_IWUSR|stat.S_IWGRP|stat.S_IWOTH)\r
-        Md5Sigature = md5.new(__FileHookOpen__(str(ToFile), 'rb').read())\r
-        Md5Sum = Md5Sigature.hexdigest()\r
+        Md5Signature = md5(__FileHookOpen__(str(ToFile), 'rb').read())\r
+        Md5Sum = Md5Signature.hexdigest()\r
         if (ToFile, Md5Sum) not in Package.FileList:\r
             Package.FileList.append((ToFile, Md5Sum))\r
     Package.SetIncludeArchList(PackageIncludeArchList)\r