From 659ef95c9b8aced3c4ded81c48bcc0fbde4d429f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 18 Jun 2015 15:14:19 +0100 Subject: bitbake: Add explict getVar param for (non) expansion Rather than just use d.getVar(X), use the more explict d.getVar(X, False) since at some point in the future, having the default of expansion would be nice. This is the first step towards that. This patch was mostly made using the command: sed -e 's:\(getVar([^,()]*\)\s*):\1, False):g' -i `grep -ril getVar *` Signed-off-by: Richard Purdie --- lib/bb/build.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/bb/build.py') diff --git a/lib/bb/build.py b/lib/bb/build.py index 0f6aa1a14..14dc5e061 100644 --- a/lib/bb/build.py +++ b/lib/bb/build.py @@ -159,7 +159,7 @@ class LogTee(object): def exec_func(func, d, dirs = None): """Execute a BB 'function'""" - body = d.getVar(func) + body = d.getVar(func, False) if not body: if body is None: logger.warn("Function %s doesn't exist", func) @@ -646,7 +646,7 @@ def stampfile(taskname, d, file_name = None): return stamp_internal(taskname, d, file_name) def add_tasks(tasklist, deltasklist, d): - task_deps = d.getVar('_task_deps') + task_deps = d.getVar('_task_deps', False) if not task_deps: task_deps = {} if not 'tasks' in task_deps: @@ -696,7 +696,7 @@ def addtask(task, before, after, d): task = "do_" + task d.setVarFlag(task, "task", 1) - bbtasks = d.getVar('__BBTASKS') or [] + bbtasks = d.getVar('__BBTASKS', False) or [] if not task in bbtasks: bbtasks.append(task) d.setVar('__BBTASKS', bbtasks) @@ -719,7 +719,7 @@ def deltask(task, d): if task[:3] != "do_": task = "do_" + task - bbtasks = d.getVar('__BBDELTASKS') or [] + bbtasks = d.getVar('__BBDELTASKS', False) or [] if not task in bbtasks: bbtasks.append(task) d.setVar('__BBDELTASKS', bbtasks) -- cgit 1.2.3-korg