From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 F36EA2095DFEC for ; Fri, 11 Aug 2017 21:34:10 -0700 (PDT) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP; 11 Aug 2017 21:36:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,361,1498546800"; d="scan'208";a="138776485" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga005.fm.intel.com with ESMTP; 11 Aug 2017 21:36:31 -0700 Received: from fmsmsx156.amr.corp.intel.com (10.18.116.74) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 11 Aug 2017 21:36:31 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx156.amr.corp.intel.com (10.18.116.74) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 11 Aug 2017 21:36:31 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.236]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.135]) with mapi id 14.03.0319.002; Sat, 12 Aug 2017 12:36:29 +0800 From: "Zhu, Yonghong" To: "Zhu, Yonghong" , "edk2-devel@lists.01.org" CC: "Gao, Liming" , "Zhang, YanyanX" , "Zhu, Yonghong" Thread-Topic: [edk2] [Patch] BaseTools: Support TabSpace between section tag in DEC file Thread-Index: AQHTEky89Np2vUAxmUGv9RMjCtpTNKKAJHBw Date: Sat, 12 Aug 2017 04:36:29 +0000 Message-ID: References: <1502419877-34960-1-git-send-email-yonghong.zhu@intel.com> In-Reply-To: <1502419877-34960-1-git-send-email-yonghong.zhu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNGI3MTUwNWUtZWFkYi00M2IxLTg1MWMtNmVkMGY2MmVkMzA2IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE2LjUuOS4zIiwiVHJ1c3RlZExhYmVsSGFzaCI6IldzY3hQT1h3XC9zUnFya1NpRU93QUZxeWJoWW1pTEJ5SVlOVmU4dkpsdTJVPSJ9 x-ctpclassification: CTP_IC dlp-product: dlpe-windows dlp-version: 10.0.102.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] BaseTools: Support TabSpace between section tag in DEC file X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Aug 2017 04:34:11 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Yonghong Zhu =20 Best Regards, Zhu Yonghong -----Original Message----- From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Yong= hong Zhu Sent: Friday, August 11, 2017 10:51 AM To: edk2-devel@lists.01.org Cc: Gao, Liming ; Zhang, YanyanX Subject: [edk2] [Patch] BaseTools: Support TabSpace between section tag in = DEC file From: Yanyan Zhang Per DEC spec, multiple section tag use to separate, and it can support= Tab, so this patch fix the bug to use Tab. ::=3D {} {} ::=3D * Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yanyan Zhang --- BaseTools/Source/Python/Workspace/MetaFileParser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTool= s/Source/Python/Workspace/MetaFileParser.py index e98352a..b756361 100644 --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py @@ -1752,11 +1752,11 @@ class DecParser(MetaFileParser): self._Scope =3D [] self._SectionName =3D '' self._SectionType =3D [] ArchList =3D set() PrivateList =3D set() - Line =3D self._CurrentLine.replace("%s%s" % (TAB_COMMA_SPLIT, TAB_= SPACE_SPLIT), TAB_COMMA_SPLIT) + Line =3D re.sub(',[\s]*', TAB_COMMA_SPLIT, self._CurrentLine) for Item in Line[1:-1].split(TAB_COMMA_SPLIT): if Item =3D=3D '': EdkLogger.error("Parser", FORMAT_UNKNOWN_ERROR, "section name can NOT be empty or incorrec= tly use separator comma", self.MetaFile, self._LineIndex + 1, self._= CurrentLine) -- 2.6.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel