From patchwork Mon Mar 11 14:26:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 19682 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 737F9BD1F1 for ; Mon, 11 Mar 2024 14:26:11 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 01F5462C8C; Mon, 11 Mar 2024 15:26:11 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="FJSW9PBl"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id F243A62C8B for ; Mon, 11 Mar 2024 15:26:08 +0100 (CET) Received: from Monstersaurus.local (aztw-30-b2-v4wan-166917-cust845.vm26.cable.virginm.net [82.37.23.78]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 9D1DEF0A; Mon, 11 Mar 2024 15:25:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1710167147; bh=/g5TqUMZD56xLS9ee+FDvgxbx5vbqV0HYVEFgzY2D34=; h=From:To:Cc:Subject:Date:From; b=FJSW9PBlrLywQ1Ragtm0oPVjSmBhSPIoFLcc1GycFQ1gXlX4t3g246X7SZVj3xFBs hj3Lc09tdN3OjcRkK7HCbxtlz5TjBdEcT6YiXwnsceECG6wqvlaCTMkVKUseE08b+E ymZrREiivnFtl7xg0Ymp/nfiug63la6mE4q22HB8= From: Kieran Bingham To: libcamera devel Subject: [PATCH v2] utils: checkstyle.py: Fix known_trailers sort order Date: Mon, 11 Mar 2024 14:26:04 +0000 Message-Id: <20240311142604.326356-1-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Hans de Goede An unruly libcamera maintainer merged the wrong patch adding the Co-developed-by: tag to the known_trailers. Fix the sort order alphabetically to match the version which should have been merged. Reviewed-by: Kieran Bingham Signed-off-by: Hans de Goede Signed-off-by: Kieran Bingham --- Keeping Hans' authorship on the commit to reflect that /he/ got the final code state right. But I keep getting things wrong ;-) v2: - move the line rather than duplicate it! utils/checkstyle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/checkstyle.py b/utils/checkstyle.py index 52cf770c9da3..db5a550d518f 100755 --- a/utils/checkstyle.py +++ b/utils/checkstyle.py @@ -471,6 +471,7 @@ class TrailersChecker(CommitChecker): known_trailers = { 'Acked-by': email_regex, 'Bug': link_regex, + 'Co-developed-by': email_regex, 'Fixes': commit_regex, 'Link': link_regex, 'Reported-by': validate_reported_by, @@ -478,7 +479,6 @@ class TrailersChecker(CommitChecker): 'Signed-off-by': email_regex, 'Suggested-by': email_regex, 'Tested-by': email_regex, - 'Co-developed-by': email_regex, } trailer_regex = re.compile(r'([A-Z][a-zA-Z-]*)\s*:\s*(.*)')