From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: zhijux.fan@intel.com) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by groups.io with SMTP; Mon, 29 Apr 2019 19:13:06 -0700 X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Apr 2019 19:13:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,412,1549958400"; d="dat'59?scan'59,208,59";a="146855717" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga003.jf.intel.com with ESMTP; 29 Apr 2019 19:13:05 -0700 Received: from fmsmsx157.amr.corp.intel.com (10.18.116.73) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 29 Apr 2019 19:13:04 -0700 Received: from shsmsx105.ccr.corp.intel.com (10.239.4.158) by FMSMSX157.amr.corp.intel.com (10.18.116.73) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 29 Apr 2019 19:13:04 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.129]) by SHSMSX105.ccr.corp.intel.com ([169.254.11.10]) with mapi id 14.03.0415.000; Tue, 30 Apr 2019 10:13:02 +0800 From: "Fan, ZhijuX" To: "devel@edk2.groups.io" CC: "Gao, Liming" , "Feng, Bob C" Subject: [PATCH] BaseTools:corrected error message for the DatumType error Thread-Topic: [PATCH] BaseTools:corrected error message for the DatumType error Thread-Index: AdT++jtirIXBduGQSgWIIEUgJ9pFpg== Date: Tue, 30 Apr 2019 02:13:02 +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 Return-Path: zhijux.fan@intel.com X-Groupsio-MsgNum: 39814 Content-Type: multipart/mixed; boundary="_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5710FSHSMSX101ccrcor_" Content-Language: en-US --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5710FSHSMSX101ccrcor_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D1762 For structure Pcd, Its DatumType may be self-defined, If the PCD DatumType format is incorrect, this PCD DatumType error message is inappropriate. This patch corrects the error message. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Zhiju.Fan --- BaseTools/Source/Python/Workspace/DscBuildData.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/= Source/Python/Workspace/DscBuildData.py index 5431296b5a..f20a2fcf28 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -943,9 +943,10 @@ class DscBuildData(PlatformBuildClassObject): EdkLogger.error('build', FORMAT_INVALID, ErrStr, File=3Dse= lf.MetaFile, Line=3DLineNo, ExtraData=3D"%s.%s" % (TokenSpaceGuid, Pcd= CName)) if PcdType in (MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_EX= _DEFAULT, MODEL_PCD_FIXED_AT_BUILD, MODEL_PCD_PATCHABLE_IN_MODULE): - if self._DecPcds[PcdCName, TokenSpaceGuid].DatumType.strip= () !=3D ValueList[1].strip(): - EdkLogger.error('build', FORMAT_INVALID, "Pcd datumtyp= e used in DSC file is not the same as its declaration in DEC file.", File= =3Dself.MetaFile, Line=3DLineNo, - ExtraData=3D"%s.%s|%s" % (TokenSpaceGuid, = PcdCName, Setting)) + if self._DecPcds[PcdCName, TokenSpaceGuid].BaseDatumType.s= trip() !=3D ValueList[1].strip(): + DecPcd =3D self._DecPcds[PcdCName, TokenSpaceGuid] + EdkLogger.error('build', FORMAT_INVALID, "Pcd datumtyp= e used in DSC file is not the same as its declaration in \n%s(Line: %s). = DatumType:%s"% (PathClass(NormPath(DecPcd.PkgPath), GlobalData.gWorkspac= e, Arch=3Dself._Arch), DecPcd.PcdDefineLineNo, DecPcd.DatumType), File=3Dse= lf.MetaFile, Line=3DLineNo, + ExtraData=3D"Dsc:%s.%s|%s\n Dec:%s.%s|%s|%s= |%s" % (TokenSpaceGuid, PcdCName, Setting, TokenSpaceGuid, PcdCName, DecPcd= .DefaultValueFromDec, DecPcd.DatumType, DecPcd.TokenValue)) if (TokenSpaceGuid + '.' + PcdCName) in GlobalData.gPlatformPcds: if GlobalData.gPlatformPcds[TokenSpaceGuid + '.' + PcdCName] != =3D ValueList[Index]: GlobalData.gPlatformPcds[TokenSpaceGuid + '.' + PcdCName] = =3D ValueList[Index] --=20 2.14.1.windows.1 --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5710FSHSMSX101ccrcor_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" 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 X7lsXY7MSU0S/l28H8LmvZ++r7+/wMXBT4eVBk+xJQUyLjE0ydD+LgPwHcAj4GVQAFAlGxVCAcvg AAAAHwBCAAEAAAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAHwBlAAEAAAAqAAAAegBoAGkA agB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAGQAAQAAAAoAAABTAE0AVABQ AAAAAAACAUEAAQAAAGQAAAAAAAAAgSsfpL6jEBmdbgDdAQ9UAgAAAIBGAGEAbgAsACAAWgBoAGkA agB1AFgAAABTAE0AVABQAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBt AAAAHwACXQEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAA AAAfAOVfAQAAADIAAABzAGkAcAA6AHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBj AG8AbQAAAAAAHwAaDAEAAAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAHwAfDAEAAAAqAAAA egBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAB4MAQAAAAoAAABT AE0AVABQAAAAAAACARkMAQAAAGQAAAAAAAAAgSsfpL6jEBmdbgDdAQ9UAgAAAIBGAGEAbgAsACAA WgBoAGkAagB1AFgAAABTAE0AVABQAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAu AGMAbwBtAAAAHwABXQEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMA bwBtAAAAAAAfAPg/AQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfACNAAQAAACoAAAB6 AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AIkABAAAACgAAAFMA TQBUAFAAAAAAAAIB+T8BAAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYAYQBuACwAIABa AGgAaQBqAHUAWAAAAFMATQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4A YwBvAG0AAAAfAAldAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBv AG0AAAAAAAsAQDoBAAAAHwAaAAEAAAASAAAASQBQAE0ALgBOAG8AdABlAAAAAAADAPE/CQQAAAsA QDoBAAAAAwD9P+QEAAACAQswAQAAABAAAABXaUeE1/jrSKTNHHUPpRwsAwAXAAEAAABAADkAAAsL Pfr+1AFAAAgwzX92Pfr+1AEfAACAhgMCAAAAAADAAAAAAAAARgEAAAAeAAAAYQBjAGMAZQBwAHQA bABhAG4AZwB1AGEAZwBlAAAAAAABAAAADAAAAGUAbgAtAFUAUwAAAB8ANwABAAAAhAAAAFsAUABB AFQAQwBIAF0AIABCAGEAcwBlAFQAbwBvAGwAcwA6AGMAbwByAHIAZQBjAHQAZQBkACAAZQByAHIA bwByACAAbQBlAHMAcwBhAGcAZQAgAGYAbwByACAAdABoAGUAIABEAGEAdAB1AG0AVAB5AHAAZQAg AGUAcgByAG8AcgAAAB8APQABAAAAAgAAAAAAAAADADYAAAAAAAIBcQABAAAAFgAAAAHU/vo7YqyF wXbhkEoFiCBFICfaRaYAAB8AcAABAAAAhAAAAFsAUABBAFQAQwBIAF0AIABCAGEAcwBlAFQAbwBv AGwAcwA6AGMAbwByAHIAZQBjAHQAZQBkACAAZQByAHIAbwByACAAbQBlAHMAcwBhAGcAZQAgAGYA bwByACAAdABoAGUAIABEAGEAdAB1AG0AVAB5AHAAZQAgAGUAcgByAG8AcgAAAB8ANRABAAAAkAAA ADwARgBBAEQAMABEADcARQAwAEEARQAwAEYAQQA1ADQARAA5ADgANwBGADYARQA3ADIANAAzADUA QwBBAEYARAA1ADAAQQBGADUANwAxADAARgBAAFMASABTAE0AUwBYADEAMAAxAC4AYwBjAHIALgBj AG8AcgBwAC4AaQBuAHQAZQBsAC4AYwBvAG0APgAAAAMA3j+fTgAAQAAHMGsedD36/tQBAgELAAEA AAAQAAAAV2lHhNf460ikzRx1D6UcLAMAJgAAAAAAAgFHAAEAAAAyAAAAYz1VUzthPU1DSTtwPUlu dGVsO2w9U0hTTVNYMTAxLTE5MDQzMDAyMTMwMlotMTQ5NQAAAAIBEDABAAAARgAAAAAAAAAmd705 O+w4SaSmFT3LpXtCBwD60Nfgrg+lTZh/bnJDXK/VAAAARBFeAACmk2g2iHZsS6dK0+tHmkxkAAAJ VI9aAAAAAB8A+j8BAAAAGAAAAEYAYQBuACwAIABaAGgAaQBqAHUAWAAAAAMACVkBAAAAQAAAgAgg BgAAAAAAwAAAAAAAAEYAAAAAv4UAAGAnYzv6/tQBCwAAgAggBgAAAAAAwAAAAAAAAEYAAAAAgoUA AAAAAAAfAACAhgMCAAAAAADAAAAAAAAARgEAAAAYAAAAZABsAHAALQBwAHIAbwBkAHUAYwB0AAAA AQAAABoAAABkAGwAcABlAC0AdwBpAG4AZABvAHcAcwAAAAAAHwAAgIYDAgAAAAAAwAAAAAAAAEYB AAAAGAAAAGQAbABwAC0AdgBlAHIAcwBpAG8AbgAAAAEAAAAWAAAAMQAxAC4AMAAuADYAMAAwAC4A NwAAAAAAHwAAgIYDAgAAAAAAwAAAAAAAAEYBAAAAGgAAAGQAbABwAC0AcgBlAGEAYwB0AGkAbwBu AAAAAAABAAAAFAAAAG4AbwAtAGEAYwB0AGkAbwBuAAAAAwANNP0/AAAfAACAhgMCAAAAAADAAAAA AAAARgEAAAAgAAAAeAAtAG0AcwAtAGgAYQBzAC0AYQB0AHQAYQBjAGgAAAABAAAAAgAAAAAAAAAf AACAhgMCAAAAAADAAAAAAAAARgEAAAAiAAAAeAAtAG8AcgBpAGcAaQBuAGEAdABpAG4AZwAtAGkA cAAAAAAAAQAAACAAAABbADEAMAAuADIAMwA5AC4AMQAyADcALgA0ADAAXQAAALqW --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF5710FSHSMSX101ccrcor_--