This patch looks fine. Reviewed-by: Bob Feng <bob.c.f...@intel.com>
-----Original Message----- From: Fan, ZhijuX Sent: Tuesday, May 21, 2019 10:07 AM To: devel@edk2.groups.io Cc: Gao, Liming <liming....@intel.com>; Feng, Bob C <bob.c.f...@intel.com> Subject: [PATCH V3] 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-de...@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.f...@intel.com> Cc: Liming Gao <liming....@intel.com> Signed-off-by: Zhiju.Fan <zhijux....@intel.com> --- BaseTools/Source/Python/Common/DataType.py | 1 ++- BaseTools/Source/Python/GenFds/GenFds.py | 2 +- BaseTools/Source/Python/Trim/Trim.py | 2 +- BaseTools/Source/Python/UPT/InstallPkg.py | 2 +- BaseTools/Source/Python/UPT/InventoryWs.py | 2 +- BaseTools/Source/Python/UPT/Logger/StringTable.py | 3 ++- BaseTools/Source/Python/UPT/MkPkg.py | 2 +- BaseTools/Source/Python/UPT/ReplacePkg.py | 2 +- BaseTools/Source/Python/UPT/RmPkg.py | 2 +- BaseTools/Source/Python/UPT/TestInstall.py | 2 +- BaseTools/Source/Python/build/build.py | 2 +- 11 files changed, 13 insertions(+), 11 deletions(-) diff --git a/BaseTools/Source/Python/Common/DataType.py b/BaseTools/Source/Python/Common/DataType.py index 780711bf8e..873bd4c9da 100644 --- 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' EDK_NAME = 'EDK' EDKII_NAME = 'EDKII' +MSG_EDKII_MAIL_ADDR = 'devel@edk2.groups.io' COMPONENT_TO_MODULE_MAP_DICT = { EDK_COMPONENT_TYPE_LIBRARY : SUP_MODULE_BASE, diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py index 21ae9c4d4c..5888997761 100644 --- a/BaseTools/Source/Python/GenFds/GenFds.py +++ b/BaseTools/Source/Python/GenFds/GenFds.py @@ -388,7 +388,7 @@ def GenFdsApi(FdsCommandDict, WorkSpaceDataBase=None): "\nPython", CODE_ERROR, "Tools code failure", - ExtraData="Please send email to edk2-de...@lists.01.org for help, attaching following call stack trace!\n", + ExtraData="Please send email to %s for help, + attaching following call stack trace!\n" % MSG_EDKII_MAIL_ADDR, RaiseError=False ) EdkLogger.quiet(traceback.format_exc()) diff --git a/BaseTools/Source/Python/Trim/Trim.py b/BaseTools/Source/Python/Trim/Trim.py index 6f29f1a35a..43119bd7ff 100644 --- a/BaseTools/Source/Python/Trim/Trim.py +++ b/BaseTools/Source/Python/Trim/Trim.py @@ -533,7 +533,7 @@ def Main(): "\nTrim", CODE_ERROR, "Unknown fatal error when trimming [%s]" % InputFile, - ExtraData="\n(Please send email to edk2-de...@lists.01.org for help, attaching following call stack trace!)\n", + ExtraData="\n(Please send email to %s for help, + attaching following call stack trace!)\n" % MSG_EDKII_MAIL_ADDR, RaiseError=False ) EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc()) diff --git a/BaseTools/Source/Python/UPT/InstallPkg.py b/BaseTools/Source/Python/UPT/InstallPkg.py index 6cb9f2533d..e4c7565441 100644 --- a/BaseTools/Source/Python/UPT/InstallPkg.py +++ b/BaseTools/Source/Python/UPT/InstallPkg.py @@ -547,7 +547,7 @@ def Main(Options = None): "\nInstallPkg", CODE_ERROR, ST.ERR_UNKNOWN_FATAL_INSTALL_ERR % Options.PackageFile, - ExtraData=ST.MSG_SEARCH_FOR_HELP, + ExtraData=ST.MSG_SEARCH_FOR_HELP % + ST.MSG_EDKII_MAIL_ADDR, RaiseError=False ) Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), diff --git a/BaseTools/Source/Python/UPT/InventoryWs.py b/BaseTools/Source/Python/UPT/InventoryWs.py index 778c139edc..955b2e510e 100644 --- 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", CODE_ERROR, ST.ERR_UNKNOWN_FATAL_INVENTORYWS_ERR, - ExtraData=ST.MSG_SEARCH_FOR_HELP, + ExtraData=ST.MSG_SEARCH_FOR_HELP % + ST.MSG_EDKII_MAIL_ADDR, RaiseError=False ) Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), diff --git a/BaseTools/Source/Python/UPT/Logger/StringTable.py b/BaseTools/Source/Python/UPT/Logger/StringTable.py index 59f71d390b..cc3f2826c0 100644 --- 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") MSG_UPDATE_PACKAGE_DATABASE = _("Update Distribution Package Database ...") MSG_PYTHON_ON = _("(Python %s on %s) ") +MSG_EDKII_MAIL_ADDR = 'devel@edk2.groups.io' MSG_SEARCH_FOR_HELP = _( - "\n(Please send email to edk2-de...@lists.01.org for\n" + "\n(Please send email to %s for\n" " help, attach the following call stack trace.)\n") MSG_REMOVE_TEMP_FILE_STARTED = _("Removing temp files started ... ") MSG_REMOVE_TEMP_FILE_DONE = _("Removing temp files ... Done.") diff --git a/BaseTools/Source/Python/UPT/MkPkg.py b/BaseTools/Source/Python/UPT/MkPkg.py index 3c2771f881..c6d4731ed6 100644 --- a/BaseTools/Source/Python/UPT/MkPkg.py +++ b/BaseTools/Source/Python/UPT/MkPkg.py @@ -225,7 +225,7 @@ def Main(Options = None): CODE_ERROR, ST.ERR_UNKNOWN_FATAL_CREATING_ERR % \ Options.PackFileToCreate, - ExtraData=ST.MSG_SEARCH_FOR_HELP, + ExtraData=ST.MSG_SEARCH_FOR_HELP % + ST.MSG_EDKII_MAIL_ADDR, RaiseError=False ) Logger.Quiet(ST.MSG_PYTHON_ON % \ diff --git a/BaseTools/Source/Python/UPT/ReplacePkg.py b/BaseTools/Source/Python/UPT/ReplacePkg.py index 843f62159d..03b91dab84 100644 --- a/BaseTools/Source/Python/UPT/ReplacePkg.py +++ b/BaseTools/Source/Python/UPT/ReplacePkg.py @@ -81,7 +81,7 @@ def Main(Options = None): "\nReplacePkg", CODE_ERROR, ST.ERR_UNKNOWN_FATAL_REPLACE_ERR % (Options.PackFileToReplace, Options.PackFileToBeReplaced), - ExtraData=ST.MSG_SEARCH_FOR_HELP, + ExtraData=ST.MSG_SEARCH_FOR_HELP % + ST.MSG_EDKII_MAIL_ADDR, RaiseError=False ) Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), diff --git a/BaseTools/Source/Python/UPT/RmPkg.py b/BaseTools/Source/Python/UPT/RmPkg.py index e3db8b6a5a..cf37e2bdca 100644 --- a/BaseTools/Source/Python/UPT/RmPkg.py +++ b/BaseTools/Source/Python/UPT/RmPkg.py @@ -166,7 +166,7 @@ def Main(Options = None): "\nRmPkg", CODE_ERROR, ST.ERR_UNKNOWN_FATAL_REMOVING_ERR, - ExtraData=ST.MSG_SEARCH_FOR_HELP, + ExtraData=ST.MSG_SEARCH_FOR_HELP % + ST.MSG_EDKII_MAIL_ADDR, RaiseError=False ) Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) + \ diff --git a/BaseTools/Source/Python/UPT/TestInstall.py b/BaseTools/Source/Python/UPT/TestInstall.py index 443c493ec7..1adc19260d 100644 --- a/BaseTools/Source/Python/UPT/TestInstall.py +++ b/BaseTools/Source/Python/UPT/TestInstall.py @@ -73,7 +73,7 @@ def Main(Options=None): "\nTestInstallPkg", TE.CODE_ERROR, ST.ERR_UNKNOWN_FATAL_INSTALL_ERR % Options.DistFiles, - ExtraData=ST.MSG_SEARCH_FOR_HELP, + ExtraData=ST.MSG_SEARCH_FOR_HELP % + ST.MSG_EDKII_MAIL_ADDR, RaiseError=False ) Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) + format_exc()) diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py index 7271570d29..81f544ccdc 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -2480,7 +2480,7 @@ def Main(): "\nbuild", CODE_ERROR, "Unknown fatal error when processing [%s]" % MetaFile, - ExtraData="\n(Please send email to edk2-de...@lists.01.org for help, attaching following call stack trace!)\n", + ExtraData="\n(Please send email to %s for help, + attaching following call stack trace!)\n" % MSG_EDKII_MAIL_ADDR, RaiseError=False ) EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(), sys.platform) + traceback.format_exc()) -- 2.14.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#41102): https://edk2.groups.io/g/devel/message/41102 Mute This Topic: https://groups.io/mt/31692595/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
