diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-04-11 17:03:55 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-02 15:41:33 +0100 |
commit | 1180bab54e2879401f3586c91a48174191a1ee8b (patch) | |
tree | a45aeee20eb5969cc1ac778fac47134929f4e021 /bitbake/lib/bb/build.py | |
parent | 5b216c8000dbc3ed9f3e996242eb24269fcaf919 (diff) | |
download | poky-1180bab54e2879401f3586c91a48174191a1ee8b.tar.gz |
Apply some 2to3 transforms that don't cause issues in 2.6
(Bitbake rev: d39ab776e7ceaefc8361150151cf0892dcb70d9c)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/build.py')
-rw-r--r-- | bitbake/lib/bb/build.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index 3d71013998..4f14e63ac7 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/lib/bb/build.py | |||
@@ -140,7 +140,7 @@ def exec_func(func, d, dirs = None): | |||
140 | so = os.popen("tee \"%s\"" % logfile, "w") | 140 | so = os.popen("tee \"%s\"" % logfile, "w") |
141 | else: | 141 | else: |
142 | so = file(logfile, 'w') | 142 | so = file(logfile, 'w') |
143 | except OSError, e: | 143 | except OSError as e: |
144 | bb.msg.error(bb.msg.domain.Build, "opening log file: %s" % e) | 144 | bb.msg.error(bb.msg.domain.Build, "opening log file: %s" % e) |
145 | pass | 145 | pass |
146 | 146 | ||
@@ -285,7 +285,7 @@ def exec_task(task, d): | |||
285 | event.fire(TaskStarted(task, localdata), localdata) | 285 | event.fire(TaskStarted(task, localdata), localdata) |
286 | exec_func(task, localdata) | 286 | exec_func(task, localdata) |
287 | event.fire(TaskSucceeded(task, localdata), localdata) | 287 | event.fire(TaskSucceeded(task, localdata), localdata) |
288 | except FuncFailed, message: | 288 | except FuncFailed as message: |
289 | # Try to extract the optional logfile | 289 | # Try to extract the optional logfile |
290 | try: | 290 | try: |
291 | (msg, logfile) = message | 291 | (msg, logfile) = message |