From 7b91d1e58c8e96445b96ec92534f82163236ff3c Mon Sep 17 00:00:00 2001 From: Elena Uziunaite Date: Tue, 10 Dec 2024 15:43:10 +0000 Subject: [PATCH] Make script work in both branches Signed-off-by: Elena Uziunaite --- scripts/code_style.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/scripts/code_style.py b/scripts/code_style.py index 26b691c2f..63cc6dc7a 100755 --- a/scripts/code_style.py +++ b/scripts/code_style.py @@ -11,6 +11,7 @@ import re import subprocess import sys from typing import FrozenSet, List, Optional +from mbedtls_framework import build_tree UNCRUSTIFY_SUPPORTED_VERSION = "0.75.1" CONFIG_FILE = ".uncrustify.cfg" @@ -132,11 +133,17 @@ def get_src_files(since: Optional[str]) -> List[str]: # Don't correct style for third-party files (and, for simplicity, # companion files in the same subtree), or for automatically # generated files (we're correcting the templates instead). - src_files = [filename for filename in src_files - if not (filename.startswith("tf-psa-crypto/drivers/everest/") or - filename.startswith("tf-psa-crypto/drivers/p256-m/") or - filename in generated_files or - is_file_autogenerated(filename))] + if build_tree.is_mbedtls_3_6(): + src_files = [filename for filename in src_files + if not (filename.startswith("3rdparty/") or + filename in generated_files or + is_file_autogenerated(filename))] + else: + src_files = [filename for filename in src_files + if not (filename.startswith("tf-psa-crypto/drivers/everest/") or + filename.startswith("tf-psa-crypto/drivers/p256-m/") or + filename in generated_files or + is_file_autogenerated(filename))] return src_files def get_submodule_hash(commit: str, submodule: str) -> str: