diff options
| -rw-r--r-- | bitbake/lib/bb/__init__.py | 2 | ||||
| -rw-r--r-- | meta/classes/spdx-common.bbclass | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/bitbake/lib/bb/__init__.py b/bitbake/lib/bb/__init__.py index 0cc1080c994..afe2326e82d 100644 --- a/bitbake/lib/bb/__init__.py +++ b/bitbake/lib/bb/__init__.py @@ -228,7 +228,7 @@ def deprecate_import(current, modulename, fromlist, renames = None): setattr(sys.modules[current], newname, newobj) -TaskData = namedtuple("TaskDep", [ +TaskData = namedtuple("TaskData", [ "pn", "taskname", "fn", diff --git a/meta/classes/spdx-common.bbclass b/meta/classes/spdx-common.bbclass index 82bdbcb9ad6..f02a47a185a 100644 --- a/meta/classes/spdx-common.bbclass +++ b/meta/classes/spdx-common.bbclass @@ -127,12 +127,11 @@ def collect_direct_deps(d, dep_task): bb.fatal(f"Unable to find this {pn}:{current_task} in taskdepdata") deps = set() - taskhash_deps = this_dep[8] - for dep_name in this_dep[3]: + for dep_name in this_dep.deps: dep_data = taskdepdata[dep_name] - if dep_data[1] == dep_task and dep_data[0] != pn: - deps.add((dep_data[0], dep_data[7], dep_name in taskhash_deps)) + if dep_data.taskname == dep_task and dep_data.pn != pn: + deps.add((dep_data.pn, dep_data.hashfn, dep_name in this_dep.taskhash_deps)) return sorted(deps) |