diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2011-01-01 23:55:54 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2011-01-04 14:46:54 +0000 |
commit | 0090a798eb868ebc926944eac2e6d4a5aff3e1b3 (patch) | |
tree | 9b90e66234e6ad7b9616c8c5944029426746110f /bitbake/lib/bb/data.py | |
parent | e8c48e668c7525257926ab7db9b6e44aa2705483 (diff) | |
download | poky-0090a798eb868ebc926944eac2e6d4a5aff3e1b3.tar.gz |
bitbake: Sync a load of whitespace and other non-functionality changes with bitbake uptream
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/data.py')
-rw-r--r-- | bitbake/lib/bb/data.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index 0aa8b404cb..b3abf318af 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py | |||
@@ -259,7 +259,7 @@ def emit_func(func, o=sys.__stdout__, d = init()): | |||
259 | for key in keys: | 259 | for key in keys: |
260 | emit_var(key, o, d, False) and o.write('\n') | 260 | emit_var(key, o, d, False) and o.write('\n') |
261 | 261 | ||
262 | emit_var(func, o, d, False) and o.write('\n') | 262 | emit_var(func, o, d, False) and o.write('\n') |
263 | newdeps = bb.codeparser.ShellParser().parse_shell(d.getVar(func, True)) | 263 | newdeps = bb.codeparser.ShellParser().parse_shell(d.getVar(func, True)) |
264 | seen = set() | 264 | seen = set() |
265 | while newdeps: | 265 | while newdeps: |
@@ -299,7 +299,7 @@ def build_dependencies(key, keys, shelldeps, d): | |||
299 | deps |= set((d.getVarFlag(key, "vardeps", True) or "").split()) | 299 | deps |= set((d.getVarFlag(key, "vardeps", True) or "").split()) |
300 | deps -= set((d.getVarFlag(key, "vardepsexclude", True) or "").split()) | 300 | deps -= set((d.getVarFlag(key, "vardepsexclude", True) or "").split()) |
301 | except: | 301 | except: |
302 | bb.note("Error expanding variable %s" % key) | 302 | bb.note("Error expanding variable %s" % key) |
303 | raise | 303 | raise |
304 | return deps | 304 | return deps |
305 | #bb.note("Variable %s references %s and calls %s" % (key, str(deps), str(execs))) | 305 | #bb.note("Variable %s references %s and calls %s" % (key, str(deps), str(execs))) |