From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 6EACE21959CB2 for ; Wed, 20 Feb 2019 05:34:21 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Feb 2019 05:34:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,391,1544515200"; d="scan'208";a="148371363" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga001.fm.intel.com with ESMTP; 20 Feb 2019 05:34:19 -0800 Received: from fmsmsx102.amr.corp.intel.com (10.18.124.200) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 20 Feb 2019 05:34:19 -0800 Received: from shsmsx106.ccr.corp.intel.com (10.239.4.159) by FMSMSX102.amr.corp.intel.com (10.18.124.200) with Microsoft SMTP Server (TLS) id 14.3.408.0; Wed, 20 Feb 2019 05:34:19 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.102]) by SHSMSX106.ccr.corp.intel.com ([169.254.10.174]) with mapi id 14.03.0415.000; Wed, 20 Feb 2019 21:34:17 +0800 From: "Gao, Liming" To: "Feng, Bob C" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] BaseTool: Fixed incremental rebuild issue. Thread-Index: AQHUyQRqQDNU6xHLqkyEdKrcmIJ5EqXor+DQ Date: Wed, 20 Feb 2019 13:34:16 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E3E2967@SHSMSX104.ccr.corp.intel.com> References: <20190220100925.40008-1-bob.c.feng@intel.com> In-Reply-To: <20190220100925.40008-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZjE4ZmRlNTYtMjdmMy00ZmYxLTkxYzAtNDUzZGYzZjc0MmQ5IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiSUJKUXpram1raDRvQjZsOFpPM0E0YUpya2Z4Zm1cLzV1NHA1UGQ0Q0ptK083R1U1SktZK04zOUhJVk5BSVFJV2sifQ== dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] BaseTool: Fixed incremental rebuild issue. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2019 13:34:21 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao > -----Original Message----- > From: Feng, Bob C > Sent: Wednesday, February 20, 2019 6:09 PM > To: edk2-devel@lists.01.org > Cc: Feng, Bob C ; Gao, Liming > Subject: [Patch] BaseTool: Fixed incremental rebuild issue. >=20 > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1540 >=20 > This issue in introduced by commit > d943b0c339fe3d35ffdf9f580ccb7a55915c6854 >=20 > To convert bytes to string, we need to use bytes.decode() > instead of using str(bytes) >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Bob Feng > Cc: Liming Gao > --- > BaseTools/Source/Python/AutoGen/GenMake.py | 2 +- > BaseTools/Source/Python/Workspace/DscBuildData.py | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Sourc= e/Python/AutoGen/GenMake.py > index 53c5b8577d..641ed8305f 100644 > --- a/BaseTools/Source/Python/AutoGen/GenMake.py > +++ b/BaseTools/Source/Python/AutoGen/GenMake.py > @@ -1048,11 +1048,11 @@ cleanlib: >=20 > if FileContent[0] =3D=3D 0xff or FileContent[0] =3D=3D 0= xfe: > FileContent =3D FileContent.decode('utf-16') > else: > try: > - FileContent =3D str(FileContent) > + FileContent =3D FileContent.decode() > except: > pass > IncludedFileList =3D gIncludePattern.findall(FileContent= ) >=20 > for Inc in IncludedFileList: > diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTool= s/Source/Python/Workspace/DscBuildData.py > index 1ffefe6e7e..74bc333144 100644 > --- a/BaseTools/Source/Python/Workspace/DscBuildData.py > +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py > @@ -158,11 +158,11 @@ def GetDependencyList(FileStack, SearchPathList): > if FileContent[0] =3D=3D 0xff or FileContent[0] =3D=3D 0xfe: > FileContent =3D FileContent.decode('utf-16') > IncludedFileList =3D gIncludePattern.findall(FileContent= ) > else: > try: > - FileContent =3D str(FileContent) > + FileContent =3D FileContent.decode() > IncludedFileList =3D gIncludePattern.findall(FileCon= tent) > except: > pass > IncludedFileList =3D gIncludePattern.findall(FileContent) >=20 > -- > 2.20.1.windows.1