From nobody Tue May 14 17:54:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+111064+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111064+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=quicinc.com ARC-Seal: i=1; a=rsa-sha256; t=1699644676; cv=none; d=zohomail.com; s=zohoarc; b=PqVrz4dwCaLnpgnu8jM0kWyddJEHV2U9Rpd61IjbD6oCwzJgeDrdQnSXqw3lJ8cKW0nGejrqa1n2pNWAiWuEXQhPOIebjLF2y0beiLtFdWjOadayXfO5V8M4vH4QRgUT82/avNvVDe8PwD+B3Nu4+fWeD6eJI/2vzEn2JPbqtaM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699644676; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=lXxOQNequ7ZJOrAUUg7o7Oq4zlMVSSYQI0A8eVNbJ0s=; b=FNGq6ELLyGo4HWU5Ftdp7ptaFxQPq5xPDZRq8JC8E3yaAs1motBirGZsO2j2JQpk+77pnbJlq4Q6fsYDvAPJt1lQnC4fAj4ZC7OjPar2c9qvwkNLQACq+yzzt/ro35D7h2qCfoCTtQUaDbhZc9yk3tsQ9fh0qd10165bvot2+cc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111064+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1699644676716389.5998080023654; Fri, 10 Nov 2023 11:31:16 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=waA/Kts+QbEahdd/oC9zFeXd2KUiz8DvTIFN414oe8o=; c=relaxed/simple; d=groups.io; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1699644676; v=1; b=GGsQbmZTvV0I6xiij4DI0Q5Dis3nhIbgtiQlWbZPROX01ZYCfAWBhXXeADyen8ppe+tT8ryr epGzUvxz1hLMzt8k449sWtwR73LGAb3ybPsxwf6PQXwNm92zKo/lWaMxL3Fv5hYtP/u5ZcRo6a5 06e5VbTzH7UTEiWWJeCK5UiA= X-Received: by 127.0.0.2 with SMTP id 0ZCYYY1788612xBEx7Z2mpXv; Fri, 10 Nov 2023 11:31:16 -0800 X-Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by mx.groups.io with SMTP id smtpd.web10.37038.1699644675963178810 for ; Fri, 10 Nov 2023 11:31:15 -0800 X-Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3AAIjvM1027397; Fri, 10 Nov 2023 19:31:06 GMT X-Received: from nasanppmta01.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3u9h9v9c7f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 10 Nov 2023 19:31:06 +0000 X-Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA01.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 3AAJV5Qk025505 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 10 Nov 2023 19:31:05 GMT X-Received: from qc-i7.qualcomm.com (10.80.80.8) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39; Fri, 10 Nov 2023 11:31:03 -0800 From: "Leif Lindholm" To: CC: Michael D Kinney , Rebecca Cran , Liming Gao , Bob Feng , Yuwei Chen Subject: [edk2-devel] [PATCH v3 1/5] BaseTools/Scripts/GetMaintainer: Fix logic bug collecting maintainers Date: Fri, 10 Nov 2023 19:30:49 +0000 Message-ID: <20231110193053.673595-2-quic_llindhol@quicinc.com> In-Reply-To: <20231110193053.673595-1-quic_llindhol@quicinc.com> References: <20231110193053.673595-1-quic_llindhol@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-GUID: QyQMXWJInvoCUdzHUqKWKUV7v6pU-KpJ X-Proofpoint-ORIG-GUID: QyQMXWJInvoCUdzHUqKWKUV7v6pU-KpJ Precedence: Bulk List-Subscribe: List-Help: 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,quic_llindhol@quicinc.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 7SU1ZaMgwe4TA6a9JFa7ivCwx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1699644677447100005 Content-Type: text/plain; charset="utf-8" From: Michael D Kinney REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4593 Fix logic bug where maintainers is incorrectly added to lists. Cc: Rebecca Cran Cc: Liming Gao Cc: Bob Feng Cc: Yuwei Chen Cc: Leif Lindholm Signed-off-by: Michael D Kinney Acked-by: Rebecca Cran Reviewed-by: Leif Lindholm --- BaseTools/Scripts/GetMaintainer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Scripts/GetMaintainer.py b/BaseTools/Scripts/GetMain= tainer.py index d1e042c0afe4..2a3147c059b5 100644 --- a/BaseTools/Scripts/GetMaintainer.py +++ b/BaseTools/Scripts/GetMaintainer.py @@ -88,7 +88,7 @@ def get_section_maintainers(path, section): if isinstance(address, list): maintainers +=3D address else: - lists +=3D [address] + maintainers +=3D [address] for address in section['list']: # Convert to list if necessary if isinstance(address, list): --=20 2.39.2 -=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 (#111064): https://edk2.groups.io/g/devel/message/111064 Mute This Topic: https://groups.io/mt/102513767/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 14 17:54:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+111065+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111065+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=quicinc.com ARC-Seal: i=1; a=rsa-sha256; t=1699644678; cv=none; d=zohomail.com; s=zohoarc; b=I++hlzDMB+o4UVPiHPW0Jd8RzOW/6nCAFJwOvGBb85Dl2guMABZ6h/K/3sBb7C9wi3Czdso5jSeTKuX9cFj0lkXHxY+aSxjhxmnbsuiKFsfsQ+UoCmrbuT4WsLIT4v7LOBtVeNe4NnYDngQVCmSpv0y6zD/2qEOyk/vcRfIu+8M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699644678; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=MH+7VsTUl8bOQ1krPVRqUyuirdAu62Gui73J2kFTDTY=; b=Ld1GTdWVUxm0xJkXQqSm2QlwrUFaH/40DKf2Bn0t6NkmEMcTOrxWmQSkbJN26UGtsd/3FeUnYDjCWrzu6SbM/EkCvEPzga9H2j9G3WpcypIclw9lqnnKg0q3pdqrjqD9iEHtcIa+k/XZNF6Tn91yH7g2SVS81Iuv4C71rjL4fWk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111065+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1699644678094903.2779271355469; Fri, 10 Nov 2023 11:31:18 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=X9/zsKXGppbasQ17vn/7tnWuVzBQsA3R2TKmfyPYUS4=; c=relaxed/simple; d=groups.io; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1699644677; v=1; b=RvgpKf6q9cbLlBFG3a9Si9s2AfNqyIf4ZzayeyWhn4Ki5nxYzn4cQN/GXmSZGC6BcFi04Wl3 6KdG9INuEY+0PTumqIyREpkAUDxJUdZ4l/dH80EoPAIh09wl9T7Jc3o9tcCJ1B0RBnB5e8U4YMc 7JbfgO5JNGWpiU8E1ocCYkN4= X-Received: by 127.0.0.2 with SMTP id xvrUYY1788612x7E6r3KZJvP; Fri, 10 Nov 2023 11:31:17 -0800 X-Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by mx.groups.io with SMTP id smtpd.web10.37039.1699644677268060426 for ; Fri, 10 Nov 2023 11:31:17 -0800 X-Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3AAHSbDN032404; Fri, 10 Nov 2023 19:31:09 GMT X-Received: from nasanppmta05.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3u9dx1hw1b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 10 Nov 2023 19:31:08 +0000 X-Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 3AAJV8Id008360 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 10 Nov 2023 19:31:08 GMT X-Received: from qc-i7.qualcomm.com (10.80.80.8) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39; Fri, 10 Nov 2023 11:31:06 -0800 From: "Leif Lindholm" To: CC: Michael D Kinney , Rebecca Cran , Liming Gao , Bob Feng , Yuwei Chen Subject: [edk2-devel] [PATCH v3 2/5] BaseTools/Scripts/GetMaintainer: Simplify logic Date: Fri, 10 Nov 2023 19:30:50 +0000 Message-ID: <20231110193053.673595-3-quic_llindhol@quicinc.com> In-Reply-To: <20231110193053.673595-1-quic_llindhol@quicinc.com> References: <20231110193053.673595-1-quic_llindhol@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-ORIG-GUID: ci_ZVnpjp3uT5aNK6-2pxUDhVppmI4Pf X-Proofpoint-GUID: ci_ZVnpjp3uT5aNK6-2pxUDhVppmI4Pf Precedence: Bulk List-Subscribe: List-Help: 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,quic_llindhol@quicinc.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: IXwkwudrGqgkYcW4zV7355z7x1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1699644679461100007 Content-Type: text/plain; charset="utf-8" From: Michael D Kinney REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4593 get_section_maintainers() either returns a list with valid entries or an empty list. It never returns None. Simplify logic that accumulates maintainers and lists by unconditionally appending lists returned from get_section_maintainers(). Cc: Rebecca Cran Cc: Liming Gao Cc: Bob Feng Cc: Yuwei Chen Cc: Leif Lindholm Signed-off-by: Michael D Kinney Acked-by: Rebecca Cran Reviewed-by: Leif Lindholm --- BaseTools/Scripts/GetMaintainer.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/BaseTools/Scripts/GetMaintainer.py b/BaseTools/Scripts/GetMain= tainer.py index 2a3147c059b5..cdcdff750635 100644 --- a/BaseTools/Scripts/GetMaintainer.py +++ b/BaseTools/Scripts/GetMaintainer.py @@ -105,10 +105,8 @@ def get_maintainers(path, sections, level=3D0): lists =3D [] for section in sections: tmp_maint, tmp_lists =3D get_section_maintainers(path, section) - if tmp_maint: - maintainers +=3D tmp_maint - if tmp_lists: - lists +=3D tmp_lists + maintainers +=3D tmp_maint + lists +=3D tmp_lists =20 if not maintainers: # If no match found, look for match for (nonexistent) file --=20 2.39.2 -=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 (#111065): https://edk2.groups.io/g/devel/message/111065 Mute This Topic: https://groups.io/mt/102513768/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 14 17:54:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+111066+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111066+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=quicinc.com ARC-Seal: i=1; a=rsa-sha256; t=1699644682; cv=none; d=zohomail.com; s=zohoarc; b=Qa6DTRQ27xTVe+w2rwFfMGXTPoUbpkPPBquojG2LfrXZksiHAZnU9A0c1ZvYaXD9vRQpZzb0D9iSJZuNzXnxQ/0Ox0lOENscnomJywjPK51RJBLJLtzvJXpQ3FdyEWGJfpkilaVnPLEFE32ODHHr4ubjylI2hJcH1U+UBRaL7wE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699644682; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=sH7lnWRRla0nEEJs3Wtt5XsNEMWn4rSCLI1SuUNJSL0=; b=n6KoevQg/j1CJ9HEJ1VvgETeWkes5lShVTLugp6NuKOYGyvqj6X55hXnt0fAoofHURGIMdtjOzJCoggkQq7457XyztUxVUCQdtVruabZXKeUm1C8fjLnc48qM9GgCAE0mzDl/mg69T71zE/5ZkBK2xGGhYLZi2fwjEOjvJ9Qpyo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111066+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1699644682284977.6244619855701; Fri, 10 Nov 2023 11:31:22 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=gkR6r6leCHjH47MYoq5o4sJpM2/6HJnWOMZfSglhUpE=; c=relaxed/simple; d=groups.io; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1699644681; v=1; b=nw3VBCS45SUzAmN1E3F+Bx7IHDW+M42l/yh2U9OjFCZTWBpyzOSoryKz+1g4psvizGMRXFpO 2/Go+R5SJ0OIri7K7OSXprbAtwtbI0ks3xs+ys5R8Zb3A6MWMSviOOM3LJiFqH/OuuFZUoSWFWA QDXO6o0mdECOM5dEgQVPTimo= X-Received: by 127.0.0.2 with SMTP id tVOCYY1788612xD0V6iiAQwZ; Fri, 10 Nov 2023 11:31:21 -0800 X-Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web11.37342.1699644681248061624 for ; Fri, 10 Nov 2023 11:31:21 -0800 X-Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3AAJFF6k024547; Fri, 10 Nov 2023 19:31:11 GMT X-Received: from nasanppmta05.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3u9tgy02se-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 10 Nov 2023 19:31:11 +0000 X-Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA05.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 3AAJVAVR008983 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 10 Nov 2023 19:31:10 GMT X-Received: from qc-i7.qualcomm.com (10.80.80.8) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39; Fri, 10 Nov 2023 11:31:08 -0800 From: "Leif Lindholm" To: CC: Michael D Kinney , Rebecca Cran , Liming Gao , Bob Feng , Yuwei Chen Subject: [edk2-devel] [PATCH v3 3/5] BaseTools/Scripts/GetMaintainer: refactor internal returns as dicts Date: Fri, 10 Nov 2023 19:30:51 +0000 Message-ID: <20231110193053.673595-4-quic_llindhol@quicinc.com> In-Reply-To: <20231110193053.673595-1-quic_llindhol@quicinc.com> References: <20231110193053.673595-1-quic_llindhol@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-GUID: hkonbljCClqqczWQ3Y343UclamVXmSfH X-Proofpoint-ORIG-GUID: hkonbljCClqqczWQ3Y343UclamVXmSfH Precedence: Bulk List-Subscribe: List-Help: 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,quic_llindhol@quicinc.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: BqkkvANFh8jwQ2azZPUAbtV6x1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1699644683541100001 Content-Type: text/plain; charset="utf-8" To clean up interfaces, change the lookup functions to return dictionaries rather than multiple values. Cc: Rebecca Cran Cc: Liming Gao Cc: Bob Feng Cc: Yuwei Chen Cc: Michael D Kinney Signed-off-by: Leif Lindholm Acked-by: Rebecca Cran Reviewed-by: Leif Lindholm Reviewed-by: Michael D Kinney --- BaseTools/Scripts/GetMaintainer.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/BaseTools/Scripts/GetMaintainer.py b/BaseTools/Scripts/GetMain= tainer.py index cdcdff750635..cb3aadbbefb1 100644 --- a/BaseTools/Scripts/GetMaintainer.py +++ b/BaseTools/Scripts/GetMaintainer.py @@ -96,7 +96,7 @@ def get_section_maintainers(path, section): else: lists +=3D [address] =20 - return maintainers, lists + return {'maintainers': maintainers, 'lists': lists} =20 def get_maintainers(path, sections, level=3D0): """For 'path', iterates over all sections, returning maintainers @@ -104,22 +104,24 @@ def get_maintainers(path, sections, level=3D0): maintainers =3D [] lists =3D [] for section in sections: - tmp_maint, tmp_lists =3D get_section_maintainers(path, section) - maintainers +=3D tmp_maint - lists +=3D tmp_lists + recipients =3D get_section_maintainers(path, section) + maintainers +=3D recipients['maintainers'] + lists +=3D recipients['lists'] =20 if not maintainers: # If no match found, look for match for (nonexistent) file # REPO.working_dir/ print('"%s": no maintainers found, looking for default' % path) if level =3D=3D 0: - maintainers =3D get_maintainers('', sections, level= =3Dlevel + 1) + recipients =3D get_maintainers('', sections, level=3D= level + 1) + maintainers +=3D recipients['maintainers'] + lists +=3D recipients['lists'] else: print("No maintainers set for project.") if not maintainers: return None =20 - return maintainers + lists + return {'maintainers': maintainers, 'lists': lists} =20 def parse_maintainers_line(line): """Parse one line of Maintainers.txt, returning any match group and it= s key.""" @@ -184,9 +186,8 @@ if __name__ =3D=3D '__main__': =20 for file in FILES: print(file) - addresslist =3D get_maintainers(file, SECTIONS) - if addresslist: - ADDRESSES +=3D addresslist + recipients =3D get_maintainers(file, SECTIONS) + ADDRESSES +=3D recipients['maintainers'] + recipients['lists'] =20 for address in list(OrderedDict.fromkeys(ADDRESSES)): if '<' in address and '>' in address: --=20 2.39.2 -=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 (#111066): https://edk2.groups.io/g/devel/message/111066 Mute This Topic: https://groups.io/mt/102513771/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 14 17:54:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+111067+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111067+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=quicinc.com ARC-Seal: i=1; a=rsa-sha256; t=1699644683; cv=none; d=zohomail.com; s=zohoarc; b=jQXjBkGD0q6fkaWiTDFJO9jTVXr2HVuLYMsCNO5bSY6lQXbi1WAoniGgC7Y05JNwvU+6XYWjyUY32gUq2/mv0wva1Bn9svubkElg6jnhk+IRbXNOLVvlMrR1m3jjaZllvRLwSeIf8kmW4kWgubgEayOVYs+QWoz1HAXOTAgJGkU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699644683; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=utMOW3lZio+xdA20WhMwWHtoFYhXnrmGRIbpzZN90nw=; b=E4AFyIvDjtS7cEO7oajxFuMxXIffrGZMGpu4wY3JLSyP6LO0RTRR/t4heqYh9fp2zJahLRLGlb0wsVBmzjPEV3WGL8iWZO9NDfKsEMLkilVFXr79lR1CIniGOmHk9V6ycVg3cyvmo12/eCNAWwEVHflOl5or6z4tjdJ7pQ1fX9Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111067+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1699644683813603.0301650224364; Fri, 10 Nov 2023 11:31:23 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=Kw1rlwQAAuolhhC+by3XQKU0XbDMr6LQq0fiYK2pU2E=; c=relaxed/simple; d=groups.io; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1699644683; v=1; b=Prs5Ho1WK/8TFeIZebGDnhYNghnICrgYgvUw8IYOV2pPLAvjSpQAGfCMPNs3cnEJSphYjM2C rmxfoJf3QMxF5HaKawW8dIuEa4uy7fPGcYTOegWawDEvM1g1EzV9RplYryn3em0m0FqpCRiPeHW KXWA/EgUnfUtDttSevc1LA5c= X-Received: by 127.0.0.2 with SMTP id ilJzYY1788612xrN5YodCAxw; Fri, 10 Nov 2023 11:31:23 -0800 X-Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by mx.groups.io with SMTP id smtpd.web10.37046.1699644683001619100 for ; Fri, 10 Nov 2023 11:31:23 -0800 X-Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3AAHQOC0026784; Fri, 10 Nov 2023 19:31:15 GMT X-Received: from nasanppmta02.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3u9dx1hw1h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 10 Nov 2023 19:31:14 +0000 X-Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA02.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 3AAJVE1T011040 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 10 Nov 2023 19:31:14 GMT X-Received: from qc-i7.qualcomm.com (10.80.80.8) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39; Fri, 10 Nov 2023 11:31:10 -0800 From: "Leif Lindholm" To: CC: Michael D Kinney , Rebecca Cran , Liming Gao , Bob Feng , Yuwei Chen Subject: [edk2-devel] [PATCH v3 4/5] BaseTools/Scripts/GetMaintainer: Handle reviewer only case Date: Fri, 10 Nov 2023 19:30:52 +0000 Message-ID: <20231110193053.673595-5-quic_llindhol@quicinc.com> In-Reply-To: <20231110193053.673595-1-quic_llindhol@quicinc.com> References: <20231110193053.673595-1-quic_llindhol@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-ORIG-GUID: I4V1nS9g5X8_gn6GGqK6cf5hABgyrtjj X-Proofpoint-GUID: I4V1nS9g5X8_gn6GGqK6cf5hABgyrtjj Precedence: Bulk List-Subscribe: List-Help: 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,quic_llindhol@quicinc.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: MN9PbOwlxh3Gag0znVb2JeH2x1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1699644685503100006 Content-Type: text/plain; charset="utf-8" From: Michael D Kinney REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4593 If a package only has reviewers and no maintainers, then also return the maintainers. In order to detect this case, get_maintainers() is updated to return maintainers, reviews, and lists separately instead of a single merged list. This also allows this module to be used by other scripts that need to distinguish between maintainers, reviewers, and lists. Cc: Rebecca Cran Cc: Liming Gao Cc: Bob Feng Cc: Yuwei Chen Cc: Leif Lindholm Signed-off-by: Michael D Kinney Acked-by: Rebecca Cran Reviewed-by: Leif Lindholm --- BaseTools/Scripts/GetMaintainer.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/BaseTools/Scripts/GetMaintainer.py b/BaseTools/Scripts/GetMain= tainer.py index cb3aadbbefb1..1361fb6c0e30 100644 --- a/BaseTools/Scripts/GetMaintainer.py +++ b/BaseTools/Scripts/GetMaintainer.py @@ -76,6 +76,7 @@ def get_section_maintainers(path, section): """Returns a list with email addresses to any M: and R: entries matching the provided path in the provided section.""" maintainers =3D [] + reviewers =3D [] lists =3D [] nowarn_status =3D ['Supported', 'Maintained'] =20 @@ -83,12 +84,18 @@ def get_section_maintainers(path, section): for status in section['status']: if status not in nowarn_status: print('WARNING: Maintained status for "%s" is \'%s\'!' % (= path, status)) - for address in section['maintainer'], section['reviewer']: + for address in section['maintainer']: # Convert to list if necessary if isinstance(address, list): maintainers +=3D address else: maintainers +=3D [address] + for address in section['reviewer']: + # Convert to list if necessary + if isinstance(address, list): + reviewers +=3D address + else: + reviewers +=3D [address] for address in section['list']: # Convert to list if necessary if isinstance(address, list): @@ -96,16 +103,18 @@ def get_section_maintainers(path, section): else: lists +=3D [address] =20 - return {'maintainers': maintainers, 'lists': lists} + return {'maintainers': maintainers, 'reviewers': reviewers, 'lists': l= ists} =20 def get_maintainers(path, sections, level=3D0): """For 'path', iterates over all sections, returning maintainers for matching ones.""" maintainers =3D [] + reviewers =3D [] lists =3D [] for section in sections: recipients =3D get_section_maintainers(path, section) maintainers +=3D recipients['maintainers'] + reviewers +=3D recipients['reviewers'] lists +=3D recipients['lists'] =20 if not maintainers: @@ -115,13 +124,14 @@ def get_maintainers(path, sections, level=3D0): if level =3D=3D 0: recipients =3D get_maintainers('', sections, level=3D= level + 1) maintainers +=3D recipients['maintainers'] + reviewers +=3D recipients['reviewers'] lists +=3D recipients['lists'] else: print("No maintainers set for project.") if not maintainers: return None =20 - return {'maintainers': maintainers, 'lists': lists} + return {'maintainers': maintainers, 'reviewers': reviewers, 'lists': l= ists} =20 def parse_maintainers_line(line): """Parse one line of Maintainers.txt, returning any match group and it= s key.""" @@ -187,7 +197,7 @@ if __name__ =3D=3D '__main__': for file in FILES: print(file) recipients =3D get_maintainers(file, SECTIONS) - ADDRESSES +=3D recipients['maintainers'] + recipients['lists'] + ADDRESSES +=3D recipients['maintainers'] + recipients['reviewers']= + recipients['lists'] =20 for address in list(OrderedDict.fromkeys(ADDRESSES)): if '<' in address and '>' in address: --=20 2.39.2 -=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 (#111067): https://edk2.groups.io/g/devel/message/111067 Mute This Topic: https://groups.io/mt/102513772/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue May 14 17:54:19 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+111068+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111068+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=quicinc.com ARC-Seal: i=1; a=rsa-sha256; t=1699644687; cv=none; d=zohomail.com; s=zohoarc; b=TWn6/oVMp5t3kQxeZbavsrE2WqnkQhGKmNX/fmixlFzhRNAF2PvJH8N0+FQ/qALa493pUbSM2NKPVneSEUQPSc7CPw17nc7GGtqX33VNO+GMvwjmpwW2MeGiiMK5FMom5CIYjcRpJl96GDkmym3Qu8hG/7nqeBfLx1inUtRavM0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1699644687; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=2wmzBjeKIXrXgvDmq1wXQFKqBg8stfjn8vLKA9EM6Tw=; b=meyuOxH2Fq2AHyDzOthnlOEs4isp+m9fqHTIAfiaWKp2qkjg+kMB+XbxOf6nkR+SZYYIWzxCkZUOpsg5eZmBuNBFGh5G0DU24cZboJqtiWjP9j3m+UTs+iu67OLck99nH4yKk+hlqo+usgy7Wa6OU6YMA0uWBnnKd7RcLBN8MNY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+111068+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1699644687852540.0943932122226; Fri, 10 Nov 2023 11:31:27 -0800 (PST) Return-Path: DKIM-Signature: a=rsa-sha256; bh=Gww9HJjrqSJ/kDG6sgJJjizmvQEyLNVYt/bXBLu3jMg=; c=relaxed/simple; d=groups.io; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1699644687; v=1; b=e4zm0oixGhqn4t10sOorETduU6FyZVA9Mvs026XTr5f/tf2DtXh88pk7ULuwcIuZ/VzAl6Lj sVRkXowYcvuQqbiIpW1OfzTk1u/nZIfSggM8I9s2OYIXHU2+TEKkZ5i2RDJZ5QYifSLqBsmyHY7 llLo5cCnbJ2qDnnv1BYxoB6s= X-Received: by 127.0.0.2 with SMTP id riitYY1788612xXQmv2eMA25; Fri, 10 Nov 2023 11:31:27 -0800 X-Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by mx.groups.io with SMTP id smtpd.web11.37347.1699644686913475753 for ; Fri, 10 Nov 2023 11:31:27 -0800 X-Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3AAIrY4m003753; Fri, 10 Nov 2023 19:31:18 GMT X-Received: from nasanppmta02.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3u93rbu1ha-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 10 Nov 2023 19:31:17 +0000 X-Received: from nasanex01c.na.qualcomm.com (nasanex01c.na.qualcomm.com [10.45.79.139]) by NASANPPMTA02.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 3AAJVG2U011063 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 10 Nov 2023 19:31:16 GMT X-Received: from qc-i7.qualcomm.com (10.80.80.8) by nasanex01c.na.qualcomm.com (10.45.79.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39; Fri, 10 Nov 2023 11:31:14 -0800 From: "Leif Lindholm" To: CC: Michael D Kinney , Rebecca Cran , Liming Gao , Bob Feng , Yuwei Chen Subject: [edk2-devel] [PATCH v3 5/5] BaseTools/Scripts/GetMaintainer: Sort output addresses Date: Fri, 10 Nov 2023 19:30:53 +0000 Message-ID: <20231110193053.673595-6-quic_llindhol@quicinc.com> In-Reply-To: <20231110193053.673595-1-quic_llindhol@quicinc.com> References: <20231110193053.673595-1-quic_llindhol@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01c.na.qualcomm.com (10.45.79.139) X-QCInternal: smtphost X-Proofpoint-GUID: cxnPFJVAExYbGO4DI1HCv3hcmCebMNAt X-Proofpoint-ORIG-GUID: cxnPFJVAExYbGO4DI1HCv3hcmCebMNAt Precedence: Bulk List-Subscribe: List-Help: 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,quic_llindhol@quicinc.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 7sYI1VbSGB3cp4iZxzRsK3BDx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1699644689515100015 Content-Type: text/plain; charset="utf-8" From: Michael D Kinney REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4593 Sort the list of output addresses alphabetically so this script produces the same output even if the order of patches in a patch series is modified such that that order of files processed by this script changes. Use set() logic instead of OrderedDict to accumulate the list of unique addresses that are sorted alphabetically. Cc: Rebecca Cran Cc: Liming Gao Cc: Bob Feng Cc: Yuwei Chen Cc: Leif Lindholm Signed-off-by: Michael D Kinney Acked-by: Rebecca Cran Reviewed-by: Leif Lindholm --- BaseTools/Scripts/GetMaintainer.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/BaseTools/Scripts/GetMaintainer.py b/BaseTools/Scripts/GetMain= tainer.py index 1361fb6c0e30..8097ba4e7bd6 100644 --- a/BaseTools/Scripts/GetMaintainer.py +++ b/BaseTools/Scripts/GetMaintainer.py @@ -192,14 +192,16 @@ if __name__ =3D=3D '__main__': else: FILES =3D get_modified_files(REPO, ARGS) =20 - ADDRESSES =3D [] - + # Accumulate a sorted list of addresses + ADDRESSES =3D set([]) for file in FILES: print(file) recipients =3D get_maintainers(file, SECTIONS) - ADDRESSES +=3D recipients['maintainers'] + recipients['reviewers']= + recipients['lists'] + ADDRESSES |=3D set(recipients['maintainers'] + recipients['reviewe= rs'] + recipients['lists']) + ADDRESSES =3D list(ADDRESSES) + ADDRESSES.sort() =20 - for address in list(OrderedDict.fromkeys(ADDRESSES)): + for address in ADDRESSES: if '<' in address and '>' in address: address =3D address.split('>', 1)[0] + '>' print(' %s' % address) --=20 2.39.2 -=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 (#111068): https://edk2.groups.io/g/devel/message/111068 Mute This Topic: https://groups.io/mt/102513774/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-