diff options
Diffstat (limited to 'bitbake/lib/bb/taskdata.py')
-rw-r--r-- | bitbake/lib/bb/taskdata.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bitbake/lib/bb/taskdata.py b/bitbake/lib/bb/taskdata.py index 47bad6d1fa..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 | ||
@@ -451,12 +451,12 @@ class TaskData: | |||
451 | for target in self.build_targets: | 451 | for target in self.build_targets: |
452 | if fn in self.build_targets[target]: | 452 | if fn in self.build_targets[target]: |
453 | self.build_targets[target].remove(fn) | 453 | self.build_targets[target].remove(fn) |
454 | if len(self.build_targets[target]) == 0: | 454 | if not self.build_targets[target]: |
455 | self.remove_buildtarget(target, missing_list) | 455 | self.remove_buildtarget(target, missing_list) |
456 | for target in self.run_targets: | 456 | for target in self.run_targets: |
457 | if fn in self.run_targets[target]: | 457 | if fn in self.run_targets[target]: |
458 | self.run_targets[target].remove(fn) | 458 | self.run_targets[target].remove(fn) |
459 | if len(self.run_targets[target]) == 0: | 459 | if not self.run_targets[target]: |
460 | self.remove_runtarget(target, missing_list) | 460 | self.remove_runtarget(target, missing_list) |
461 | 461 | ||
462 | def remove_buildtarget(self, target, missing_list=None): | 462 | def remove_buildtarget(self, target, missing_list=None): |
@@ -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) |