From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A4A6C4167D for ; Fri, 10 Sep 2021 01:05:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2D50361132 for ; Fri, 10 Sep 2021 01:05:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344060AbhIJBFw (ORCPT ); Thu, 9 Sep 2021 21:05:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:50120 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234894AbhIJAZI (ORCPT ); Thu, 9 Sep 2021 20:25:08 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 49C57610A3; Fri, 10 Sep 2021 00:23:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631233438; bh=F/vdYu+oIWHBTO+yH/g4urvXQK6J/vpTTGtTQqwMvd8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dFTAwOu2T1qGB6QKnnLIjJCHK2HSRFTLfDPNZDdkRoOp+eltYnVEnNb87zo112BcH W2KBPq0WYCK4UA+NMFCCKgzd5kvTNEbGL1vv9O9G9x/QQJyLdmJI37GlIZJBlDVNrl tc/5AXrN9NPqk4158kYwudWC5eBD45+rgc9jHXe4UM5jjlLdWvwl+JqH9HLe5kLrsq B7rixUtqkybJ2yUOjT3naWwHQrt1CqjL+PcoH1Us6+/femjVQZtm0fj5aPz5ZeT4ti S12u+vkBt3z2dRnDfX0YQENIWmX1hkLtrzu7lnlKOcQMtZPBMPwGSMrqOogCoY/zNw URFToS94gAy2g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ariel Marcovitch , Masahiro Yamada , Sasha Levin Subject: [PATCH AUTOSEL 4.9 15/17] checkkconfigsymbols.py: Fix the '--ignore' option Date: Thu, 9 Sep 2021 20:23:36 -0400 Message-Id: <20210910002338.176677-15-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210910002338.176677-1-sashal@kernel.org> References: <20210910002338.176677-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ariel Marcovitch [ Upstream commit 1439ebd2ce77242400518d4e6a1e85bebcd8084f ] It seems like the implementation of the --ignore option is broken. In check_symbols_helper, when going through the list of files, a file is added to the list of source files to check if it matches the ignore pattern. Instead, as stated in the comment below this condition, the file should be added if it doesn't match the pattern. This means that when providing an ignore pattern, the only files that will be checked will be the ones we want the ignore, in addition to the Kconfig files that don't match the pattern (the check in parse_kconfig_files is done right) Signed-off-by: Ariel Marcovitch Signed-off-by: Masahiro Yamada Signed-off-by: Sasha Levin --- scripts/checkkconfigsymbols.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/checkkconfigsymbols.py b/scripts/checkkconfigsymbols.py index a32e4da4c117..d96ea8ded18a 100755 --- a/scripts/checkkconfigsymbols.py +++ b/scripts/checkkconfigsymbols.py @@ -329,7 +329,7 @@ def check_symbols_helper(pool, ignore): if REGEX_FILE_KCONFIG.match(gitfile): kconfig_files.append(gitfile) else: - if ignore and not re.match(ignore, gitfile): + if ignore and re.match(ignore, gitfile): continue # add source files that do not match the ignore pattern source_files.append(gitfile) -- 2.30.2