From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: bob.c.feng@intel.com) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by groups.io with SMTP; Mon, 20 May 2019 19:35:30 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 19:35:30 -0700 X-ExtLoop1: 1 Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga008.fm.intel.com with ESMTP; 20 May 2019 19:35:29 -0700 Received: from fmsmsx161.amr.corp.intel.com (10.18.125.9) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 20 May 2019 19:35:29 -0700 Received: from shsmsx107.ccr.corp.intel.com (10.239.4.96) by FMSMSX161.amr.corp.intel.com (10.18.125.9) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 20 May 2019 19:35:29 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.129]) by SHSMSX107.ccr.corp.intel.com ([169.254.9.7]) with mapi id 14.03.0415.000; Tue, 21 May 2019 10:35:27 +0800 From: "Bob Feng" To: "Fan, ZhijuX" , "devel@edk2.groups.io" CC: "Gao, Liming" Subject: Re: [PATCH V3] BaseTools:Update mailing list address in BaseTools error messages Thread-Topic: [PATCH V3] BaseTools:Update mailing list address in BaseTools error messages Thread-Index: AdUPec9s2WBumecoTSiiFPale6PTdQAA8xWQ Date: Tue, 21 May 2019 02:35:27 +0000 Message-ID: <08650203BA1BD64D8AD9B6D5D74A85D160111580@SHSMSX101.ccr.corp.intel.com> References: In-Reply-To: Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: bob.c.feng@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable This patch looks fine. Reviewed-by: Bob Feng -----Original Message----- From: Fan, ZhijuX=20 Sent: Tuesday, May 21, 2019 10:07 AM To: devel@edk2.groups.io Cc: Gao, Liming ; Feng, Bob C Subject: [PATCH V3] BaseTools:Update mailing list address in BaseTools erro= r messages BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D1815 The edk2 source tree contains four instances of the outdated mailing list a= ddress "edk2-devel@lists.01.org". I created a new variable, MSG_EDKII_MAIL_ADDR, to receive the new email add= ress and replaced the old one with this variable Cc: Bob Feng Cc: Liming Gao Signed-off-by: Zhiju.Fan --- 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 =3D 'SAL_RT_DRIVER' EDK_COMPONENT_TYPE_APPLICATION =3D 'APPLICATION' EDK_NAME =3D 'EDK' EDKII_NAME =3D 'EDKII' +MSG_EDKII_MAIL_ADDR =3D 'devel@edk2.groups.io' =20 COMPONENT_TO_MODULE_MAP_DICT =3D { EDK_COMPONENT_TYPE_LIBRARY : SUP_MODULE_BASE, diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Py= thon/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=3DNone)= : "\nPython", CODE_ERROR, "Tools code failure", - ExtraData=3D"Please send email to edk2-devel@lists.01.= org for help, attaching following call stack trace!\n", + ExtraData=3D"Please send email to %s for help,=20 + attaching following call stack trace!\n" % MSG_EDKII_MAIL_ADDR, RaiseError=3DFalse ) 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=3D"\n(Please send email to edk2-devel@lists.= 01.org for help, attaching following call stack trace!)\n", + ExtraData=3D"\n(Please send email to %s for help,=20 + attaching following call stack trace!)\n" % MSG_EDKII_MAIL_ADDR, RaiseError=3DFalse ) EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(),= sys.platform) + traceback.format_exc()) diff --git a/BaseTools/Source/Pyth= on/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 =3D None): "\nInstallPkg", CODE_ERROR, ST.ERR_UNKNOWN_FATAL_INSTALL_ERR % Options.PackageFile= , - ExtraData=3DST.MSG_SEARCH_FOR_HELP, + ExtraData=3DST.MSG_SEARCH_FOR_HELP %=20 + ST.MSG_EDKII_MAIL_ADDR, RaiseError=3DFalse ) Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), diff --git a/Ba= seTools/Source/Python/UPT/InventoryWs.py b/BaseTools/Source/Python/UPT/Inve= ntoryWs.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 =3D None): Logger.Error("\nInventoryWs", CODE_ERROR, ST.ERR_UNKNOWN_FATAL_INVENTORYWS_ERR, - ExtraData=3DST.MSG_SEARCH_FOR_HELP, + ExtraData=3DST.MSG_SEARCH_FOR_HELP %=20 + ST.MSG_EDKII_MAIL_ADDR, RaiseError=3DFalse ) Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), diff --git a/Ba= seTools/Source/Python/UPT/Logger/StringTable.py b/BaseTools/Source/Python/U= PT/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 =3D _( "Provide new filename for distribution file to be saved:\n") MSG_UPDATE_PACKAGE_DATABASE =3D _("Update Distribution Package Database= ...") MSG_PYTHON_ON =3D _("(Python %s on %s) ") +MSG_EDKII_MAIL_ADDR =3D 'devel@edk2.groups.io' MSG_SEARCH_FOR_HELP =3D _( - "\n(Please send email to edk2-devel@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 =3D _("Removing temp files started ... ") MSG_REMOVE_TEMP_FILE_DONE =3D _("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 =3D None): CODE_ERROR, ST.ERR_UNKNOWN_FATAL_CREATING_ERR % \ Options.PackFileToCreate, - ExtraData=3DST.MSG_SEARCH_FOR_HELP, + ExtraData=3DST.MSG_SEARCH_FOR_HELP %=20 + ST.MSG_EDKII_MAIL_ADDR, RaiseError=3DFalse ) Logger.Quiet(ST.MSG_PYTHON_ON % \ diff --git a/BaseTools/Source/Py= thon/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 =3D None): "\nReplacePkg", CODE_ERROR, ST.ERR_UNKNOWN_FATAL_REPLACE_ERR % (Options.PackFileTo= Replace, Options.PackFileToBeReplaced), - ExtraData=3DST.MSG_SEARCH_FOR_HELP, + ExtraData=3DST.MSG_SEARCH_FOR_HELP %=20 + ST.MSG_EDKII_MAIL_ADDR, RaiseError=3DFalse ) Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), diff --git a/Ba= seTools/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 =3D None): "\nRmPkg", CODE_ERROR, ST.ERR_UNKNOWN_FATAL_REMOVING_ERR, - ExtraData=3DST.MSG_SEARCH_FOR_HELP, + ExtraData=3DST.MSG_SEARCH_FOR_HELP %=20 + ST.MSG_EDKII_MAIL_ADDR, RaiseError=3DFalse ) Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) + \ d= iff --git a/BaseTools/Source/Python/UPT/TestInstall.py b/BaseTools/Source/P= ython/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=3DNone): "\nTestInstallPkg", TE.CODE_ERROR, ST.ERR_UNKNOWN_FATAL_INSTALL_ERR % Options.DistFiles, - ExtraData=3DST.MSG_SEARCH_FOR_HELP, + ExtraData=3DST.MSG_SEARCH_FOR_HELP %=20 + ST.MSG_EDKII_MAIL_ADDR, RaiseError=3DFalse ) Logger.Quiet(ST.MSG_PYTHON_ON % (python_version(), platform) + for= mat_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=3D"\n(Please send email to edk2-devel@lists.= 01.org for help, attaching following call stack trace!)\n", + ExtraData=3D"\n(Please send email to %s for help,=20 + attaching following call stack trace!)\n" % MSG_EDKII_MAIL_ADDR, RaiseError=3DFalse ) EdkLogger.quiet("(Python %s on %s) " % (platform.python_version(),= sys.platform) + traceback.format_exc()) -- 2.14.1.windows.1