[sdk/kde-builder] kde_builder_lib: chore: Small fixes in DependencyResolver
Andrew Shark <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit cc0cbfdaf846d7fd993a7c81bdb6d46b02fed921 by Andrew Shark.
Committed on 02/08/2026 at 18:49.
Pushed by ashark into branch 'master'.
chore: Small fixes in DependencyResolver
Fix key name to access branch value for module from module graph.
Remove unused key in the result["dependencies"][dep_item].
Follow PEP 8 variable naming convention.
M +2 -3 kde_builder_lib/dependency_resolver.py
https://invent.kde.org/sdk/kde-builder/-/commit/cc0cbfdaf846d7fd993a7c81bdb6d46b02fed921
diff --git a/kde_builder_lib/dependency_resolver.py b/kde_builder_lib/dependency_resolver.py
index efa5fca7..c73a17d3 100644
--- a/kde_builder_lib/dependency_resolver.py
+++ b/kde_builder_lib/dependency_resolver.py
@@ -229,7 +229,7 @@ class DependencyResolver:
# However, catch-alls can remove catch-alls.
# But catch-alls cannot remove a specific branch, such exclusions have
# to also be specific.
- direct_deps = [directDep for directDep in direct_deps if directDep != exclusion]
+ direct_deps = [direct_dep for direct_dep in direct_deps if direct_dep != exclusion]
result = {
"syntax_errors": 0,
@@ -259,7 +259,6 @@ class DependencyResolver:
if dep_branch == "" or dep_branch == "*":
dep_branch = None
result["dependencies"][dep_item] = {
- "item": dep_item,
"path": dep_path,
"branch": dep_branch
}
@@ -488,7 +487,7 @@ class DependencyResolver:
logger_depres.error(f"r[Found a dependency conflict in branches (\"b[{previously_selected_branch}]\" is not \"b[{branch}]\") for b[{item}]! :(")
errors["branch_errors"] += 1
elif branch:
- module_graph[item][branch] = branch
+ module_graph[item]["branch"] = branch
# May have been pulled in via dependencies but not yet marked for
# build. Do so now, since it is listed explicitly in modules list.