BaseTools:Update mailing list address in BaseTools error messages

BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=1815

The edk2 source tree contains four instances of the outdated mailing
list address "edk2-devel@lists.01.org".
I created a new variable, MSG_EDKII_MAIL_ADDR, to receive the
new email address and replaced the old one with this variable

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

diff --git a/BaseTools/Source/Python/Common/DataType.py b/BaseTools/Source/Python/Common/DataType.py
index 780711bf8e2de833da22e86e964f79072d0e10c5..7cd67bc01a93ca66aa4eb19d60a2226130afbe01 100644 (file)
--- a/BaseTools/Source/Python/Common/DataType.py
+++ b/BaseTools/Source/Python/Common/DataType.py
@@ -88,6 +88,7 @@ EDK_COMPONENT_TYPE_SAL_RT_DRIVER = 'SAL_RT_DRIVER'
 EDK_COMPONENT_TYPE_APPLICATION = 'APPLICATION'\r
 EDK_NAME = 'EDK'\r
 EDKII_NAME = 'EDKII'\r
 EDK_COMPONENT_TYPE_APPLICATION = 'APPLICATION'\r
 EDK_NAME = 'EDK'\r
 EDKII_NAME = 'EDKII'\r

+MSG_EDKII_MAIL_ADDR = 'devel@edk2.groups.io'\r

 \r
 COMPONENT_TO_MODULE_MAP_DICT = {\r
     EDK_COMPONENT_TYPE_LIBRARY               :   SUP_MODULE_BASE,\r
 \r
 COMPONENT_TO_MODULE_MAP_DICT = {\r
     EDK_COMPONENT_TYPE_LIBRARY               :   SUP_MODULE_BASE,\r

diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index 21ae9c4d4c8f2a6c051b2c5e77faefde878a497b..5888997761bb92831ea12fbcbb9011e6f41e3509 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GenFds.py
+++ b/BaseTools/Source/Python/GenFds/GenFds.py
@@ -388,7 +388,7 @@ def GenFdsApi(FdsCommandDict, WorkSpaceDataBase=None):
                     "\nPython",\r
                     CODE_ERROR,\r
                     "Tools code failure",\r
                     "\nPython",\r
                     CODE_ERROR,\r
                     "Tools code failure",\r

-                    ExtraData="Please send email to edk2-devel@lists.01.org for help, attaching following call stack trace!\n",\r
+                    ExtraData="Please send email to %s for help, attaching following call stack trace!\n" % MSG_EDKII_MAIL_ADDR,\r

                     RaiseError=False\r
                     )\r
         EdkLogger.quiet(traceback.format_exc())\r
                     RaiseError=False\r
                     )\r
         EdkLogger.quiet(traceback.format_exc())\r

diff --git a/BaseTools/Source/Python/Trim/Trim.py b/BaseTools/Source/Python/Trim/Trim.py
index 6f29f1a35a0fe7f0ef9abbdda7bf25ea8ac52875..43119bd7ff8cf4d210f03623ba9ed42efbfcc000 100644 (file)
--- a/BaseTools/Source/Python/Trim/Trim.py
+++ b/BaseTools/Source/Python/Trim/Trim.py
@@ -533,7 +533,7 @@ def Main():
                     "\nTrim",\r
                     CODE_ERROR,\r
                     "Unknown fatal error when trimming [%s]" % InputFile,\r
                     "\nTrim",\r
                     CODE_ERROR,\r
                     "Unknown fatal error when trimming [%s]" % InputFile,\r

-                    ExtraData="\n(Please send email to edk2-devel@lists.01.org for help, attaching following call stack trace!)\n",\r
+                    ExtraData="\n(Please send email to %s for help, attaching following call stack trace!)\n" % MSG_EDKII_MAIL_ADDR,\r

                     RaiseError=False\r
                     )\r
         EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc())\r
                     RaiseError=False\r
                     )\r
         EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc())\r

diff --git a/BaseTools/Source/Python/UPT/InstallPkg.py b/BaseTools/Source/Python/UPT/InstallPkg.py
index 6cb9f2533df5cd6711e573418b7f29f642988b40..e4c7565441ba1726066fc6c23ca13a01987d945a 100644 (file)
--- a/BaseTools/Source/Python/UPT/InstallPkg.py
+++ b/BaseTools/Source/Python/UPT/InstallPkg.py
@@ -547,7 +547,7 @@ def Main(Options = None):
                     "\nInstallPkg",\r
                     CODE_ERROR,\r
                     ST.ERR_UNKNOWN_FATAL_INSTALL_ERR % Options.PackageFile,\r
                     "\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
                     RaiseError=False\r
                     )\r
         Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(),\r

diff --git a/BaseTools/Source/Python/UPT/InventoryWs.py b/BaseTools/Source/Python/UPT/InventoryWs.py
index 778c139edce72f7729db92cc720f1a8f9a7fd853..955b2e510eb27a08ba5db1d3a949f9fb46ee99c9 100644 (file)
--- a/BaseTools/Source/Python/UPT/InventoryWs.py
+++ b/BaseTools/Source/Python/UPT/InventoryWs.py
@@ -99,7 +99,7 @@ def Main(Options = None):
         Logger.Error("\nInventoryWs",\r
                     CODE_ERROR,\r
                     ST.ERR_UNKNOWN_FATAL_INVENTORYWS_ERR,\r
         Logger.Error("\nInventoryWs",\r
                     CODE_ERROR,\r
                     ST.ERR_UNKNOWN_FATAL_INVENTORYWS_ERR,\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
                     RaiseError=False\r
                     )\r
         Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(),\r

diff --git a/BaseTools/Source/Python/UPT/Logger/StringTable.py b/BaseTools/Source/Python/UPT/Logger/StringTable.py
index 59f71d390befa7adc7c541bd904ac6ff9c036768..7782d262381970f5bb8062f37ce2b82c92f2accf 100644 (file)
--- a/BaseTools/Source/Python/UPT/Logger/StringTable.py
+++ b/BaseTools/Source/Python/UPT/Logger/StringTable.py
@@ -316,8 +316,9 @@ MSG_NEW_FILE_NAME_FOR_DIST      = _(
     "Provide new filename for distribution file to be saved:\n")\r
 MSG_UPDATE_PACKAGE_DATABASE    = _("Update Distribution Package Database ...")\r
 MSG_PYTHON_ON                  = _("(Python %s on %s) ")\r
     "Provide new filename for distribution file to be saved:\n")\r
 MSG_UPDATE_PACKAGE_DATABASE    = _("Update Distribution Package Database ...")\r
 MSG_PYTHON_ON                  = _("(Python %s on %s) ")\r

+MSG_EDKII_MAIL_ADDR            = 'devel@edk2.groups.io'\r

 MSG_SEARCH_FOR_HELP            = _(\r
 MSG_SEARCH_FOR_HELP            = _(\r

-    "\n(Please send email to edk2-devel@lists.01.org for\n"\r
+    "\n(Please send email to %s for\n"\r

     " help, attach the following call stack trace.)\n")\r
 MSG_REMOVE_TEMP_FILE_STARTED   = _("Removing temp files started ... ")\r
 MSG_REMOVE_TEMP_FILE_DONE   = _("Removing temp files ... Done.")\r
     " help, attach the following call stack trace.)\n")\r
 MSG_REMOVE_TEMP_FILE_STARTED   = _("Removing temp files started ... ")\r
 MSG_REMOVE_TEMP_FILE_DONE   = _("Removing temp files ... Done.")\r

diff --git a/BaseTools/Source/Python/UPT/MkPkg.py b/BaseTools/Source/Python/UPT/MkPkg.py
index 3c2771f881bb21ad8289afd4ff0c50314e6525f1..c6d4731ed65521892c4c2740daa8ff4adf2513bd 100644 (file)
--- a/BaseTools/Source/Python/UPT/MkPkg.py
+++ b/BaseTools/Source/Python/UPT/MkPkg.py
@@ -225,7 +225,7 @@ def Main(Options = None):
                     CODE_ERROR,\r
                     ST.ERR_UNKNOWN_FATAL_CREATING_ERR % \\r
                     Options.PackFileToCreate,\r
                     CODE_ERROR,\r
                     ST.ERR_UNKNOWN_FATAL_CREATING_ERR % \\r
                     Options.PackFileToCreate,\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 % \\r
                     RaiseError=False\r
                     )\r
         Logger.Quiet(ST.MSG_PYTHON_ON % \\r

diff --git a/BaseTools/Source/Python/UPT/ReplacePkg.py b/BaseTools/Source/Python/UPT/ReplacePkg.py
index 843f62159de0279de9fe4b7ad6e8b60d269a8022..03b91dab84553c4ff33b179512f417836210ae30 100644 (file)
--- a/BaseTools/Source/Python/UPT/ReplacePkg.py
+++ b/BaseTools/Source/Python/UPT/ReplacePkg.py
@@ -81,7 +81,7 @@ def Main(Options = None):
                     "\nReplacePkg",\r
                     CODE_ERROR,\r
                     ST.ERR_UNKNOWN_FATAL_REPLACE_ERR % (Options.PackFileToReplace, Options.PackFileToBeReplaced),\r
                     "\nReplacePkg",\r
                     CODE_ERROR,\r
                     ST.ERR_UNKNOWN_FATAL_REPLACE_ERR % (Options.PackFileToReplace, Options.PackFileToBeReplaced),\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
                     RaiseError=False\r
                     )\r
         Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(),\r

diff --git a/BaseTools/Source/Python/UPT/RmPkg.py b/BaseTools/Source/Python/UPT/RmPkg.py
index e3db8b6a5a24eef9cbb42deeb830aeafe762d65d..cf37e2bdcabfd287086335641220227a1795e3f9 100644 (file)
--- a/BaseTools/Source/Python/UPT/RmPkg.py
+++ b/BaseTools/Source/Python/UPT/RmPkg.py
@@ -166,7 +166,7 @@ def Main(Options = None):
                     "\nRmPkg",\r
                     CODE_ERROR,\r
                     ST.ERR_UNKNOWN_FATAL_REMOVING_ERR,\r
                     "\nRmPkg",\r
                     CODE_ERROR,\r
                     ST.ERR_UNKNOWN_FATAL_REMOVING_ERR,\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(), platform) + \\r
                     RaiseError=False\r
                     )\r
         Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) + \\r

diff --git a/BaseTools/Source/Python/UPT/TestInstall.py b/BaseTools/Source/Python/UPT/TestInstall.py
index 443c493ec76882563afaca9d3645538d53afe672..1adc19260d89d432154a42fce820bf50b5ec23c2 100644 (file)
--- a/BaseTools/Source/Python/UPT/TestInstall.py
+++ b/BaseTools/Source/Python/UPT/TestInstall.py
@@ -73,7 +73,7 @@ def Main(Options=None):
                     "\nTestInstallPkg",\r
                     TE.CODE_ERROR,\r
                     ST.ERR_UNKNOWN_FATAL_INSTALL_ERR % Options.DistFiles,\r
                     "\nTestInstallPkg",\r
                     TE.CODE_ERROR,\r
                     ST.ERR_UNKNOWN_FATAL_INSTALL_ERR % Options.DistFiles,\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(), platform) + format_exc())\r
                     RaiseError=False\r
                     )\r
         Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) + format_exc())\r

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 027061191c5eee3aa06867d83008f58a3b00ead8..78654a0deee24c8fa63d109c7865f4a352d89c33 100644 (file)
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -2485,7 +2485,7 @@ def Main():
                     "\nbuild",\r
                     CODE_ERROR,\r
                     "Unknown fatal error when processing [%s]" % MetaFile,\r
                     "\nbuild",\r
                     CODE_ERROR,\r
                     "Unknown fatal error when processing [%s]" % MetaFile,\r

-                    ExtraData="\n(Please send email to edk2-devel@lists.01.org for help, attaching following call stack trace!)\n",\r
+                    ExtraData="\n(Please send email to %s for help, attaching following call stack trace!)\n" % MSG_EDKII_MAIL_ADDR,\r

                     RaiseError=False\r
                     )\r
         EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc())\r
                     RaiseError=False\r
                     )\r
         EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc())\r