Skip to content

Commit d816c3f

Browse files
committed
Merge branch 'contrib/github_pr_17594' into 'master'
fix(depgraph): Add double quotes around dependency names (GitHub PR) Closes IDFGH-16471 See merge request espressif/esp-idf!41989
2 parents 5f5f963 + a736448 commit d816c3f

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

tools/cmake/depgraph.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ function(depgraph_add_edge dep_from dep_to)
3535
# However, show which components are "common" by adding an edge from a node named "common".
3636
# If necessary, add a new build property to customize this behavior.
3737
if(NOT dep_from IN_LIST common_reqs)
38-
idf_build_set_property(__BUILD_COMPONENT_DEPGRAPH "common -> ${dep_to}" APPEND)
38+
idf_build_set_property(__BUILD_COMPONENT_DEPGRAPH "\"common\" -> \"${dep_to}\"" APPEND)
3939
endif()
4040
else()
41-
idf_build_set_property(__BUILD_COMPONENT_DEPGRAPH "${dep_from} -> ${dep_to} ${attr}" APPEND)
41+
idf_build_set_property(__BUILD_COMPONENT_DEPGRAPH "\"${dep_from}\" -> \"${dep_to}\" ${attr}" APPEND)
4242
endif()
4343
endfunction()
4444

tools/test_apps/system/g1_components/check_dependencies.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,9 @@ def parse_dependencies(file_path: str, target: str | None = None) -> tuple[dict[
115115
parts = line.split(' -> ')
116116

117117
if len(parts) >= 2:
118-
source_component = parts[0]
119-
target_component = parts[1].split()[0] # Extracting the target component
118+
source_component = parts[0].strip('"')
119+
target_component = parts[1].split()[0].strip('"') # Extracting the target component
120+
print(f'{source_component} -> {target_component}')
120121
logging.debug(f'Parsed dependency: {source_component} -> {target_component}')
121122

122123
# Check that g1/g0 dependencies are either on the list of expected violations

0 commit comments

Comments
 (0)