diff options
Diffstat (limited to 'bitbake/lib/bb')
| -rw-r--r-- | bitbake/lib/bb/build.py | 7 | ||||
| -rw-r--r-- | bitbake/lib/bb/ui/buildinfohelper.py | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index 2e49a09365..f9aca42b37 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/lib/bb/build.py @@ -91,6 +91,9 @@ class TaskBase(event.Event): class TaskStarted(TaskBase): """Task execution started""" + def __init__(self, t, logfile, taskflags, d): + super(TaskStarted, self).__init__(t, logfile, d) + self.taskflags = taskflags class TaskSucceeded(TaskBase): """Task execution completed""" @@ -422,7 +425,9 @@ def _exec_task(fn, task, d, quieterr): localdata.setVar('BB_LOGFILE', logfn) localdata.setVar('BB_RUNTASK', task) - event.fire(TaskStarted(task, logfn, localdata), localdata) + flags = localdata.getVarFlags(task) + + event.fire(TaskStarted(task, logfn, flags, localdata), localdata) try: for func in (prefuncs or '').split(): exec_func(func, localdata) diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index 5881d136c2..4996b4235d 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/lib/bb/ui/buildinfohelper.py @@ -483,6 +483,8 @@ class BuildInfoHelper(object): task_information['outcome'] = Task.OUTCOME_EXISTING else: task_information['task_executed'] = True + if 'noexec' in vars(event) and event.noexec == True: + task_information['script_type'] = Task.CODING_NOEXEC self.task_order += 1 task_information['order'] = self.task_order @@ -506,8 +508,9 @@ class BuildInfoHelper(object): if '_message' in vars(event): task_information['message'] = event._message - if 'ispython' in vars(event): - if event.ispython: + if 'taskflags' in vars(event): + # with TaskStarted, we get even more information + if 'python' in event.taskflags.keys() and event.taskflags['python'] == '1': task_information['script_type'] = Task.CODING_PYTHON else: task_information['script_type'] = Task.CODING_SHELL |