diff options
| -rw-r--r-- | lib/bb/build.py | 7 | ||||
| -rw-r--r-- | lib/bb/data_smart.py | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/bb/build.py b/lib/bb/build.py index e4153269d..e91895302 100644 --- a/lib/bb/build.py +++ b/lib/bb/build.py @@ -278,10 +278,17 @@ def exec_task(fn, task, d): except OSError: pass + prefuncs = localdata.getVarFlag(task, 'prefuncs', expand=True) + postfuncs = localdata.getVarFlag(task, 'postfuncs', expand=True) + logfile = open(logfn, 'w') event.fire(TaskStarted(task, localdata), localdata) try: + for func in (prefuncs or '').split(): + exec_func(func, localdata, logfile=logfile) exec_func(task, localdata, logfile=logfile) + for func in (postfuncs or '').split(): + exec_func(func, localdata, logfile=logfile) except FuncFailed as exc: event.fire(TaskFailed(exc.name, exc.logfile, localdata), localdata) raise diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py index a766f3241..4a12dd41e 100644 --- a/lib/bb/data_smart.py +++ b/lib/bb/data_smart.py @@ -265,13 +265,13 @@ class DataSmart(MutableMapping): self._makeShadowCopy(var) self.dict[var][flag] = flagvalue - def getVarFlag(self, var, flag, exp = False): + def getVarFlag(self, var, flag, expand=False): local_var = self._findVar(var) value = None if local_var: if flag in local_var: value = copy.copy(local_var[flag]) - if exp and value: + if expand and value: value = self.expand(value, None) return value |