From nobody Wed May 1 23:02:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+44344+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44344+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1564015443; cv=none; d=zoho.com; s=zohoarc; b=Rt9Kzt7xuSMBasaXW/MMkYzaHNU/7hvQ4nYzlvjmjWbJhwk5a1l0nwW3epQNoi4kpnQXxDV5dmc7w/AcIBFBesfb1CMaV5QAYaXVhj1t2g5AAZ8DO5Ex0lQ3q2EAZgkuVBwmBTZV7xVU2XfAafS6Z+UlT4cmy4Mxx6f0FDlsJmI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564015443; h=Content-Type:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=thLq8SlBImMzScBTXjrxqxei19sOv1tVltWYNhlqvhg=; b=WWfsuAGfcAr/z11b0poCLonE7Cb6+y+maRxH29rZFqjB+jzyrpLEqrzKZKxTw2y46KTTk15EFIMFVFtOisMl0vWsWvxcxODkCBEh/1XYMLfuFvg0QuRERt62Lbh2UOFW6QiWdgZu2pJsZYYTbVohVQXnPD4J/XkJNYLYx04EdOk= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+44344+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1564015443186759.035368634109; Wed, 24 Jul 2019 17:44:03 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by groups.io with SMTP; Wed, 24 Jul 2019 17:44:02 -0700 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False X-Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Jul 2019 17:44:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,304,1559545200"; d="dat'59?scan'59,208,59";a="177821002" X-Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by FMSMGA003.fm.intel.com with ESMTP; 24 Jul 2019 17:44:01 -0700 X-Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 24 Jul 2019 17:44:01 -0700 X-Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.80]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.110]) with mapi id 14.03.0439.000; Thu, 25 Jul 2019 08:44:00 +0800 From: "Fan, ZhijuX" To: "devel@edk2.groups.io" CC: "Gao, Liming" , "Feng, Bob C" Subject: [edk2-devel] [PATCH] BaseTools:Add extra debugging message Thread-Topic: [PATCH] BaseTools:Add extra debugging message Thread-Index: AdVCgekcKZz+rkynTBmeBenx53Xn7w== Date: Thu, 25 Jul 2019 00:43:59 +0000 Message-ID: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,zhijux.fan@intel.com Content-Type: multipart/mixed; boundary="_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF9EBF9SHSMSX101ccrcor_" Content-Language: en-US DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1564015442; bh=nrex0wbRcac0v959VKeGTcGhwREZ06Z346meTqV8yoQ=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=H0Mnv/wwIIoun4wADreDpvtJ393nTGmRz3ka7RpgOm3dbMe9jhaHjEhCqNlLbSN1+YY KLRBGdLsS6+Oh/3lOksbtcUDs3Lfi8G/jBbcPuQAl3eJuE/muNDbkiGJUMJxdyMnR5KMx /8o/gdJShf5mmy3/Wd3KptCBcCiALEXqclI= X-Zoho-Virus-Status: 1 X-ZohoMail-DKIM: pass (identity @groups.io) --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF9EBF9SHSMSX101ccrcor_ Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add extra debugging to improve error identification. Error while processing file if the file is read incorrectly This patch is going to fix that issue. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Zhiju.Fan --- BaseTools/Source/Python/AutoGen/StrGather.py | 16 ++++++++++------ BaseTools/Source/Python/Trim/Trim.py | 4 +++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/StrGather.py b/BaseTools/Sourc= e/Python/AutoGen/StrGather.py index 2e4671a433..eed30388be 100644 --- a/BaseTools/Source/Python/AutoGen/StrGather.py +++ b/BaseTools/Source/Python/AutoGen/StrGather.py @@ -526,12 +526,16 @@ def SearchString(UniObjectClass, FileList, IsCompatib= leMode): return UniObjectClass =20 for File in FileList: - if os.path.isfile(File): - Lines =3D open(File, 'r') - for Line in Lines: - for StrName in STRING_TOKEN.findall(Line): - EdkLogger.debug(EdkLogger.DEBUG_5, "Found string ident= ifier: " + StrName) - UniObjectClass.SetStringReferenced(StrName) + try: + if os.path.isfile(File): + Lines =3D open(File, 'r') + for Line in Lines: + for StrName in STRING_TOKEN.findall(Line): + EdkLogger.debug(EdkLogger.DEBUG_5, "Found string i= dentifier: " + StrName) + UniObjectClass.SetStringReferenced(StrName) + except: + EdkLogger.error("UnicodeStringGather", AUTOGEN_ERROR, "SearchS= tring: Error while processing file", File=3DFile, RaiseError=3DFalse) + raise =20 UniObjectClass.ReToken() =20 diff --git a/BaseTools/Source/Python/Trim/Trim.py b/BaseTools/Source/Python= /Trim/Trim.py index 43119bd7ff..8767b67f7e 100644 --- a/BaseTools/Source/Python/Trim/Trim.py +++ b/BaseTools/Source/Python/Trim/Trim.py @@ -73,8 +73,10 @@ def TrimPreprocessedFile(Source, Target, ConvertHex, Tri= mLong): try: with open(Source, "r") as File: Lines =3D File.readlines() - except: + except IOError: EdkLogger.error("Trim", FILE_OPEN_FAILURE, ExtraData=3DSource) + expect: + EdkLogger.error("Trim", AUTOGEN_ERROR, "TrimPreprocessedFile: Erro= r while processing file", File=3DSource) =20 PreprocessedFile =3D "" InjectedFile =3D "" --=20 2.14.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#44344): https://edk2.groups.io/g/devel/message/44344 Mute This Topic: https://groups.io/mt/32593771/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF9EBF9SHSMSX101ccrcor_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" eJ8+ImUrAQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA5AQAAAAAAADoAAEJgAEAIQAAAEUwRkE2ODBG RkIxQTA3NDk5NUJFQzlDNzEzQUMxRUVEAIAHAQ2ABAACAAAAAgACAAEFgAMADgAAAOMHBwAZAAAA KwA7AAQAdAEBIIADAA4AAADjBwcAGQAAACsAOwAEAHQBAQiABwAYAAAASVBNLk1pY3Jvc29mdCBN YWlsLk5vdGUAMQgBBIABAC4AAABbUEFUQ0hdIEJhc2VUb29sczpBZGQgZXh0cmEgZGVidWdnaW5n IG1lc3NhZ2UALBABC4ABACEAAABFMEZBNjgwRkZCMUEwNzQ5OTVCRUM5QzcxM0FDMUVFRACABwED kAYADA8AADQAAAACAX8AAQAAAEgAAAA8RkFEMEQ3RTBBRTBGQTU0RDk4N0Y2RTcyNDM1Q0FGRDUw QUY5RUJGOUBTSFNNU1gxMDEuY2NyLmNvcnAuaW50ZWwuY29tPgALAB8OAQAAAAIBCRABAAAAgQUA AH0FAAArDAAATFpGdR+LXvBhAApmYmlkBAAAY2PAcGcxMjUyAP4DQ/B0ZXh0AfcCpAPjAgAEY2gK wHNldDAg7wdtAoMAUBFNMgqABrQCgJZ9CoAIyDsJYjE5DsC/CcMWcgoyFnECgBViKgmwcwnwBJBh dAWyDlADYHOibwGAIEV4EcFuGDBdBlJ2BJAXtgIQcgDAdH0IUG4aMRAgBcAFoBtkZJogA1IgECIX slx2CJDkd2sLgGQ1HVME8AdADRdwMApxF/Jia21rBnMBkAAgIEJNX0LgRUdJTn0K/AHxC/G4IEFk HGAQMRhwIAEAUGJ1Z2cLgGccwG+6IAdwcANgGjAh0HIDYHcFwA3QCfB0BpAOUBiAaVECIC5cbAuA ZQqARbkjo3doAxAZ4CMxYweQvwCQIrEkUCXhBpAcwGgZ4PcmxAQgCXBhHGALgAWhCXCwY3RseSTl JOVUJcCbBCAKsHQRwCfCZ28ipd0kUHgnMRiAJ8FzClAk1hEk5UNjOh+wb2IgFkYJ8CLAPAbgYi5j tC5mLbFAC4AQIGwuMDUDcD4suUwHcCKiR2HNIvA8JPAwIi5nMIAur0kUwGlnGFBkLRkwZigtYnkt QFolwGp1pC5GA5E8ejOCeC5QcwBwMW8KLTXgJOUfsGGJEgBUbwbwcy9TCGExJkAvUHknQAIgL0H6 dRiQRwnwNyAiADBwJ0EAci5weSB8IDF4NiArObc14TXvNv8velQFEG08ozkiPXY5YCB2NDmiOqcy JrMEIBmUZHosOXAzKEESAAAgJKFz6CgrKUAANyIxHnBApNwtKSkMDeABICA6gCKQuQVAYS87Pzev OLliQ88/RN84qSTlHbEQMD8AZTQANjcxYTQzMy4CLgngZDMwMzg4xmIZ4B6RNjQ0NXhDr/9Hr0i/ JSE5sUafTd9O7yUhzEBAQ0AOsDYsDpA5oP9T8zmQU7EBAQZRCsARwDiRiSKhKFUDAE9iaiix7kML YAQQQABGJdEwAB9geUAASXMIUCMgJIECYGVyTQRxKTo6tj12CXB0/whwA6BWLDq2WOoa4VcTKEH/ VxdY1kywPXUnERkQOSA40fYuBAAmwihXIljHXjc9ctcwABhQBCA9XuBwCfBf0/FAACdyJ0IWYLtc cmGCn1zyYYNgP2O6OJFOYQeAEVzyU1RSICBHX1RwT0tFTi5QHbEHQGwOKGGCYC9l20Vka0wubyKA OQEiQyhrOERFlEJVaBA1QAAiRghgfR3AIB9gVdIj5wSQLUAiXzmgZwZi72DKViwuBmB0PVW0UgEQ BJAJ8CZAZCj/b01QQD11IgAzQHQ+Xo9fn/913GFPYl94r2Q/eC9mH2cv/2g/eA+C/2svbD9tT25f c9//iV9xT3Jfc290ehAwJkAFMOeCH4PsI5MoIlYhBaABAEtVtDjEIkAAQVWA4EeBgRBfRVJST1KG Mb9VWi1AJV8maJJRVyI9eoT+UgtwEgCUY5aAB0ASAI1fb1mjlwJbP4qPLowwUMBr/3pRQhZbpkMP UM88jlBvnw8XPTJJi0rAMRZwYmQ3UwEgSvA4N0qAYkqAZv43S69Mv6FfomtQL6bvok3hU7I3Myw4 OaCsMR6Q+1TWPLJQCXAmFQmAVyKM0HtRM0AAVArAGDBXkRtFSP8QMK8RPMGEUBnAWMx1OT13rwPw J0B6JK62IpJAKaYA3wQgVyKyD3l6VyIuKAIk8t9A4G+7jm+4ZlewT5RjtP8HkB88spYSSUxFX08S UJLRRkG9MFVSRZdAABlwIgFEGIBhPVEk/5f7EDB6QCjAjs+7r7y1ko7/rW+0wpRflW+WcL78W6ut rsl6ASIiWOpJblZyyf9DNdFbpjIuMTTNkC77A/AdwG8eMM2QKQwVQs+gAAAAHwBCAAEAAAAYAAAA RgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAHwBlAAEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEAbgBA AGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAGQAAQAAAAoAAABTAE0AVABQAAAAAAACAUEAAQAAAGQA AAAAAAAAgSsfpL6jEBmdbgDdAQ9UAgAAAIBGAGEAbgAsACAAWgBoAGkAagB1AFgAAABTAE0AVABQ AAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAHwACXQEAAAAqAAAA egBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAOVfAQAAADIAAABz AGkAcAA6AHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAAHwAaDAEA AAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAHwAfDAEAAAAqAAAAegBoAGkAagB1AHgALgBm AGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAB4MAQAAAAoAAABTAE0AVABQAAAAAAACARkM AQAAAGQAAAAAAAAAgSsfpL6jEBmdbgDdAQ9UAgAAAIBGAGEAbgAsACAAWgBoAGkAagB1AFgAAABT AE0AVABQAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAHwABXQEA AAAqAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAPg/AQAA ABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfACNAAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYA YQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AIkABAAAACgAAAFMATQBUAFAAAAAAAAIB+T8B AAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYAYQBuACwAIABaAGgAaQBqAHUAWAAAAFMA TQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAfAAldAQAA ACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAAsAQDoBAAAA HwAaAAEAAAASAAAASQBQAE0ALgBOAG8AdABlAAAAAAADAPE/CQQAAAsAQDoBAAAAAwD9P+QEAAAC AQswAQAAABAAAADg+mgP+xoHSZW+yccTrB7tAwAXAAEAAABAADkAgHHkC4JC1QFAAAgwxdA0DIJC 1QEfAACAhgMCAAAAAADAAAAAAAAARgEAAAAeAAAAYQBjAGMAZQBwAHQAbABhAG4AZwB1AGEAZwBl AAAAAAABAAAADAAAAGUAbgAtAFUAUwAAAB8ANwABAAAAXAAAAFsAUABBAFQAQwBIAF0AIABCAGEA cwBlAFQAbwBvAGwAcwA6AEEAZABkACAAZQB4AHQAcgBhACAAZABlAGIAdQBnAGcAaQBuAGcAIABt AGUAcwBzAGEAZwBlAAAAHwA9AAEAAAACAAAAAAAAAAMANgAAAAAAAgFxAAEAAAAWAAAAAdVCgekc KZz+rkynTBmeBenx53Xn7wAAHwBwAAEAAABcAAAAWwBQAEEAVABDAEgAXQAgAEIAYQBzAGUAVABv AG8AbABzADoAQQBkAGQAIABlAHgAdAByAGEAIABkAGUAYgB1AGcAZwBpAG4AZwAgAG0AZQBzAHMA YQBnAGUAAAAfADUQAQAAAJAAAAA8AEYAQQBEADAARAA3AEUAMABBAEUAMABGAEEANQA0AEQAOQA4 ADcARgA2AEUANwAyADQAMwA1AEMAQQBGAEQANQAwAEEARgA5AEUAQgBGADkAQABTAEgAUwBNAFMA WAAxADAAMQAuAGMAYwByAC4AYwBvAHIAcAAuAGkAbgB0AGUAbAAuAGMAbwBtAD4AAAADAN4/n04A AEAABzBjbzIMgkLVAQIBCwABAAAAEAAAAOD6aA/7GgdJlb7JxxOsHu0DACYAAAAAAAIBRwABAAAA MQAAAGM9VVM7YT1NQ0k7cD1JbnRlbDtsPVNIU01TWDEwMS0xOTA3MjUwMDQzNTlaLTE1NgAAAAAC ARAwAQAAAEYAAAAAAAAAJne9OTvsOEmkphU9y6V7QgcA+tDX4K4PpU2Yf25yQ1yv1QAAAEQRXgAA ppNoNoh2bEunStPrR5pMZAAACVSP5gAAAAAfAPo/AQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1 AFgAAAADAAlZAQAAAEAAAIAIIAYAAAAAAMAAAAAAAABGAAAAAL+FAAAQbGQLgkLVAQsAAIAIIAYA AAAAAMAAAAAAAABGAAAAAIKFAAAAAAAAAwAAgAggBgAAAAAAwAAAAAAAAEYAAAAA64UAAAkEAAAf AACAhgMCAAAAAADAAAAAAAAARgEAAAAYAAAAZABsAHAALQBwAHIAbwBkAHUAYwB0AAAAAQAAABoA AABkAGwAcABlAC0AdwBpAG4AZABvAHcAcwAAAAAAHwAAgIYDAgAAAAAAwAAAAAAAAEYBAAAAGAAA AGQAbABwAC0AdgBlAHIAcwBpAG8AbgAAAAEAAAAWAAAAMQAxAC4AMAAuADYAMAAwAC4ANwAAAAAA HwAAgIYDAgAAAAAAwAAAAAAAAEYBAAAAGgAAAGQAbABwAC0AcgBlAGEAYwB0AGkAbwBuAAAAAAAB AAAAFAAAAG4AbwAtAGEAYwB0AGkAbwBuAAAAAwANNP0/AAAfAACAhgMCAAAAAADAAAAAAAAARgEA AAAgAAAAeAAtAG0AcwAtAGgAYQBzAC0AYQB0AHQAYQBjAGgAAAABAAAAAgAAAAAAAAAfAACAhgMC AAAAAADAAAAAAAAARgEAAAAiAAAAeAAtAG8AcgBpAGcAaQBuAGEAdABpAG4AZwAtAGkAcAAAAAAA AQAAACAAAABbADEAMAAuADIAMwA5AC4AMQAyADcALgA0ADAAXQAAANlw --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF9EBF9SHSMSX101ccrcor_--