]> git.proxmox.com Git - mirror_edk2.git/commitdiff
BaseTools/Ecc: Fix ECC check MetaFile Copyright information issue
authorYunhua Feng <fengyunhua@byosoft.com.cn>
Tue, 20 Oct 2020 02:20:02 +0000 (10:20 +0800)
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Tue, 27 Oct 2020 06:50:06 +0000 (06:50 +0000)
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3011

MetaFile Copyright support below format:

#  Copyright (C) 2020 Hewlett Packard Enterprise Development LP<BR>
#  (C) Copyright 2020 Hewlett Packard Enterprise Development LP<BR>

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Signed-off-by: Yunhua Feng <fengyunhua@byosoft.com.cn>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
BaseTools/Source/Python/Ecc/MetaDataParser.py

index 0fd9b6c4e330e8571a87eda620ea1c15014a4333..d9f0da1ee0d6c67dec21004ceda1c94d5aa96f30 100644 (file)
@@ -214,8 +214,12 @@ def _IsCopyrightLine (LineContent):
     LineContent = LineContent.upper()\r
     Result = False\r
 \r
+    #Support below Copyright format\r
+    # Copyright (C) 2020 Hewlett Packard Enterprise Development LP<BR>\r
+    # (C) Copyright 2020 Hewlett Packard Enterprise Development LP<BR>\r
     ReIsCopyrightRe = re.compile(r"""(^|\s)COPYRIGHT *\(""", re.DOTALL)\r
-    if ReIsCopyrightRe.search(LineContent):\r
+    ReIsCopyrightTypeB = re.compile(r"""(^|\s)\(C\)\s*COPYRIGHT""", re.DOTALL)\r
+    if ReIsCopyrightRe.search(LineContent) or ReIsCopyrightTypeB.search(LineContent):\r
         Result = True\r
 \r
     return Result\r