Skip to content

Fix two diagnostic bugs in validate-modern.py #40418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benhillis merged 2 commits into from
May 7, 2026
+5 −5
Merged

Fix two diagnostic bugs in validate-modern.py #40418

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5df3159
Fix two bugs in validate-modern.py
May 1, 2026
9460fc2
Address PR feedback: use original config path in diagnostic messages
May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions distributions/validate-modern.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ def validate_mode(path: str, mode, uid, gid, max_size = None, optional = False,
warning(node, f'file: "{path}" has unexpected gid: {info.gid} (expected: {gid})')

if max_size is not None and info.size > max_size:
error(node, f'file: "{path}" is too big (info.size), max: {max_size}')
error(node, f'file: "{path}" is too big ({info.size}), max: {max_size}')

if magic is not None or parse_method is not None:
content = tar.extractfile(real_path)
Expand All @@ -409,12 +409,12 @@ def validate_mode(path: str, mode, uid, gid, max_size = None, optional = False,
return True

def validate_config(path: str, valid_keys: list):
_, path = get_tar_file(tar, path, follow_symlink=True)
if path is None:
error(node, f'File "{file}" not found in tar')
_, real_path = get_tar_file(tar, path, follow_symlink=True)
if real_path is None:
error(node, f'File "{path}" not found in tar')
return None

content = tar.extractfile(path)
content = tar.extractfile(real_path)
config = configparser.ConfigParser()
config.read_string(content.read().decode())

Expand Down
Loading