Skip to content

Commit 4e0e64d

Browse files
committed
Merge branch 'fix/checksums_validation' into 'main'
fix: Incorrect checksums validation Closes PACMAN-1116 See merge request espressif/idf-component-manager!503
2 parents cdea8e2 + 766511f commit 4e0e64d

File tree

1 file changed

+1
-18
lines changed

1 file changed

+1
-18
lines changed

idf_component_tools/hash_tools/validate.py

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import typing as t
55
from pathlib import Path
66

7-
from idf_component_tools.file_tools import filtered_paths
87
from idf_component_tools.manager import ManifestManager
98

109
from .calculate import hash_dir, hash_file
@@ -154,23 +153,7 @@ def validate_checksums_eq_hashdir(
154153
f'Hash "{expected_file.hash}" for file "{expected_file_path}" is not a valid SHA256 hash'
155154
)
156155

157-
manifest_manager = ManifestManager(root, 'test')
158-
manifest = manifest_manager.load()
159-
160-
exclude_set = set(manifest.exclude_set)
161-
exclude_set.add(f'**/{HASH_FILENAME}')
162-
exclude_set.add(f'**/{CHECKSUMS_FILENAME}')
163-
164-
paths = sorted(
165-
filtered_paths(
166-
root,
167-
use_gitignore=manifest.use_gitignore,
168-
include=manifest.include_set,
169-
exclude=exclude_set,
170-
exclude_default=False,
171-
),
172-
key=lambda path: path.relative_to(root).as_posix(),
173-
)
156+
paths = [file_path for file_path in root_path.rglob('*') if file_path.is_file()]
174157

175158
for expected_file in expected_checksums.files:
176159
expected_file_path = root_path / expected_file.path

0 commit comments

Comments
 (0)