summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-10-22 17:32:12 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-10-22 17:32:12 +0100
commiteb0d2f2615dbd15f8931d677b005ecc8f808126d (patch)
tree6458f30ca93adb79c8df2f17e9383ac4257ea005
parenta1a308c54671f20bf9eaf87f74fc6e5ec01842c9 (diff)
downloadpoky-eb0d2f2615dbd15f8931d677b005ecc8f808126d.tar.gz
poky-eb0d2f2615dbd15f8931d677b005ecc8f808126d.tar.bz2
poky-eb0d2f2615dbd15f8931d677b005ecc8f808126d.zip
bitbake-dev: Fix a couple of bugs that crept in breaking runtime
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--bitbake-dev/lib/bb/build.py2
-rw-r--r--bitbake-dev/lib/bb/parse/parse_py/BBHandler.py2
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):
so.close()
se.close()
- if os.path.getsize(logfile) == 0:
+ if os.path.exists(logfile) and os.path.getsize(logfile) == 0:
bb.msg.debug(2, bb.msg.domain.Build, "Zero size logfile %s, removing" % logfile)
os.remove(logfile)
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):
for f in anonfuncs:
code = code + " %s(d)\n" % f
data.setVar("__anonfunc", code, d)
- build.exec_func_python("__anonfunc", d)
+ build.exec_func("__anonfunc", d)
data.delVar('T', d)
if t:
data.setVar('T', t, d)