Skip to content
Merged
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion capgen/ccpp_capgen.py
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,7 @@ def _load_metadata_files(
file_list: List[str],
expected_types: frozenset,
label: str,
logger=None,
) -> List[MetadataTable]:
"""Load and validate a list of metadata files.

Expand All @@ -651,6 +652,8 @@ def _load_metadata_files(
label : str
Human-readable description (``'host'`` or ``'scheme'``) used in
error messages.
logger : logging.Logger, optional
Logger to use. Defaults to the module-level logger.

Returns
-------
Expand All @@ -662,9 +665,10 @@ def _load_metadata_files(
CCPPError
On any parse error or unexpected table type.
"""
log = logger or _LOGGER
tables: List[MetadataTable] = []
for fpath in file_list:
_LOGGER.info("Reading %s metadata: %s", label, fpath)
log.info("Reading %s metadata: %s", label, fpath)
file_tables = parse_metadata_file(fpath)
for tbl in file_tables:
if tbl.table_type not in expected_types:
Expand Down Expand Up @@ -921,6 +925,7 @@ def capgen(
framework_meta + list(host_files),
expected_types=frozenset({'host', 'control', 'ddt'}),
label='host',
logger=log,
)
log.info("Loaded %d host/control/ddt tables", len(host_tables))

Expand All @@ -930,6 +935,7 @@ def capgen(
scheme_files,
expected_types=frozenset({'scheme', 'ddt'}),
label='scheme',
logger=log,
)
log.info("Loaded %d scheme/ddt tables", len(scheme_tables))

Expand Down
Loading