diff options
| author | Scott Murray <scott.murray@konsulko.com> | 2022-02-17 17:09:33 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-21 23:37:26 +0000 |
| commit | 424269caeadd21b01a860d032ca81167c7ce7239 (patch) | |
| tree | 62b67232f8b358fddac8617ded45df7aa61442a2 /bitbake/lib/bb/taskdata.py | |
| parent | 09a62d96c76333f8abda1d28156378e42630fd9a (diff) | |
| download | poky-424269caeadd21b01a860d032ca81167c7ce7239.tar.gz | |
bitbake: lib/bb: Replace "abort" usage in task handling
In line with the inclusive language migration defined at:
https://wiki.yoctoproject.org/wiki/Inclusive_language
replace the use of "abort" with "halt" in code related to handling
task failure.
(Bitbake rev: 831fb7f2329a3cd95b71e9c85d7d7f0d717f947f)
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/taskdata.py')
| -rw-r--r-- | bitbake/lib/bb/taskdata.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/taskdata.py b/bitbake/lib/bb/taskdata.py index 7bfcdb8414..66545a65af 100644 --- a/bitbake/lib/bb/taskdata.py +++ b/bitbake/lib/bb/taskdata.py | |||
| @@ -39,7 +39,7 @@ class TaskData: | |||
| 39 | """ | 39 | """ |
| 40 | BitBake Task Data implementation | 40 | BitBake Task Data implementation |
| 41 | """ | 41 | """ |
| 42 | def __init__(self, abort = True, skiplist = None, allowincomplete = False): | 42 | def __init__(self, halt = True, skiplist = None, allowincomplete = False): |
| 43 | self.build_targets = {} | 43 | self.build_targets = {} |
| 44 | self.run_targets = {} | 44 | self.run_targets = {} |
| 45 | 45 | ||
| @@ -57,7 +57,7 @@ class TaskData: | |||
| 57 | self.failed_rdeps = [] | 57 | self.failed_rdeps = [] |
| 58 | self.failed_fns = [] | 58 | self.failed_fns = [] |
| 59 | 59 | ||
| 60 | self.abort = abort | 60 | self.halt = halt |
| 61 | self.allowincomplete = allowincomplete | 61 | self.allowincomplete = allowincomplete |
| 62 | 62 | ||
| 63 | self.skiplist = skiplist | 63 | self.skiplist = skiplist |
| @@ -328,7 +328,7 @@ class TaskData: | |||
| 328 | try: | 328 | try: |
| 329 | self.add_provider_internal(cfgData, dataCache, item) | 329 | self.add_provider_internal(cfgData, dataCache, item) |
| 330 | except bb.providers.NoProvider: | 330 | except bb.providers.NoProvider: |
| 331 | if self.abort: | 331 | if self.halt: |
| 332 | raise | 332 | raise |
| 333 | self.remove_buildtarget(item) | 333 | self.remove_buildtarget(item) |
| 334 | 334 | ||
| @@ -479,7 +479,7 @@ class TaskData: | |||
| 479 | fn = tid.rsplit(":",1)[0] | 479 | fn = tid.rsplit(":",1)[0] |
| 480 | self.fail_fn(fn, missing_list) | 480 | self.fail_fn(fn, missing_list) |
| 481 | 481 | ||
| 482 | if self.abort and target in self.external_targets: | 482 | if self.halt and target in self.external_targets: |
| 483 | logger.error("Required build target '%s' has no buildable providers.\nMissing or unbuildable dependency chain was: %s", target, missing_list) | 483 | logger.error("Required build target '%s' has no buildable providers.\nMissing or unbuildable dependency chain was: %s", target, missing_list) |
| 484 | raise bb.providers.NoProvider(target) | 484 | raise bb.providers.NoProvider(target) |
| 485 | 485 | ||
| @@ -516,7 +516,7 @@ class TaskData: | |||
| 516 | self.add_provider_internal(cfgData, dataCache, target) | 516 | self.add_provider_internal(cfgData, dataCache, target) |
| 517 | added = added + 1 | 517 | added = added + 1 |
| 518 | except bb.providers.NoProvider: | 518 | except bb.providers.NoProvider: |
| 519 | if self.abort and target in self.external_targets and not self.allowincomplete: | 519 | if self.halt and target in self.external_targets and not self.allowincomplete: |
| 520 | raise | 520 | raise |
| 521 | if not self.allowincomplete: | 521 | if not self.allowincomplete: |
| 522 | self.remove_buildtarget(target) | 522 | self.remove_buildtarget(target) |
