diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-10-22 17:32:12 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-10-22 17:32:12 +0100 |
commit | eb0d2f2615dbd15f8931d677b005ecc8f808126d (patch) | |
tree | 6458f30ca93adb79c8df2f17e9383ac4257ea005 /bitbake-dev | |
parent | a1a308c54671f20bf9eaf87f74fc6e5ec01842c9 (diff) | |
download | poky-eb0d2f2615dbd15f8931d677b005ecc8f808126d.tar.gz |
bitbake-dev: Fix a couple of bugs that crept in breaking runtime
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake-dev')
-rw-r--r-- | bitbake-dev/lib/bb/build.py | 2 | ||||
-rw-r--r-- | bitbake-dev/lib/bb/parse/parse_py/BBHandler.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bitbake-dev/lib/bb/build.py b/bitbake-dev/lib/bb/build.py index b37bcf63bc..65e8118b4f 100644 --- a/bitbake-dev/lib/bb/build.py +++ b/bitbake-dev/lib/bb/build.py | |||
@@ -191,7 +191,7 @@ def exec_func(func, d, dirs = None): | |||
191 | so.close() | 191 | so.close() |
192 | se.close() | 192 | se.close() |
193 | 193 | ||
194 | if os.path.getsize(logfile) == 0: | 194 | if os.path.exists(logfile) and os.path.getsize(logfile) == 0: |
195 | bb.msg.debug(2, bb.msg.domain.Build, "Zero size logfile %s, removing" % logfile) | 195 | bb.msg.debug(2, bb.msg.domain.Build, "Zero size logfile %s, removing" % logfile) |
196 | os.remove(logfile) | 196 | os.remove(logfile) |
197 | 197 | ||
diff --git a/bitbake-dev/lib/bb/parse/parse_py/BBHandler.py b/bitbake-dev/lib/bb/parse/parse_py/BBHandler.py index 76b917ca5d..f0c3409568 100644 --- a/bitbake-dev/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake-dev/lib/bb/parse/parse_py/BBHandler.py | |||
@@ -94,7 +94,7 @@ def finalise(fn, d): | |||
94 | for f in anonfuncs: | 94 | for f in anonfuncs: |
95 | code = code + " %s(d)\n" % f | 95 | code = code + " %s(d)\n" % f |
96 | data.setVar("__anonfunc", code, d) | 96 | data.setVar("__anonfunc", code, d) |
97 | build.exec_func_python("__anonfunc", d) | 97 | build.exec_func("__anonfunc", d) |
98 | data.delVar('T', d) | 98 | data.delVar('T', d) |
99 | if t: | 99 | if t: |
100 | data.setVar('T', t, d) | 100 | data.setVar('T', t, d) |