diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-01-19 14:48:19 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-01-19 14:48:19 +0000 |
commit | 22a271aaa99daeb6b29c42c2c1dc670bf204310e (patch) | |
tree | d2690b66e7a613820f34ceaecbce65809cbd22a3 /bitbake-dev/lib/bb/ui/ncurses.py | |
parent | cefe87fc3c4202e942f34666813bc094df2ffb4b (diff) | |
download | poky-22a271aaa99daeb6b29c42c2c1dc670bf204310e.tar.gz |
bitbake-dev: Sync with upstream
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake-dev/lib/bb/ui/ncurses.py')
-rw-r--r-- | bitbake-dev/lib/bb/ui/ncurses.py | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/bitbake-dev/lib/bb/ui/ncurses.py b/bitbake-dev/lib/bb/ui/ncurses.py index 2cd7e8e6e7..14310dc124 100644 --- a/bitbake-dev/lib/bb/ui/ncurses.py +++ b/bitbake-dev/lib/bb/ui/ncurses.py | |||
@@ -246,29 +246,29 @@ class NCursesUI: | |||
246 | continue | 246 | continue |
247 | helper.eventHandler(event) | 247 | helper.eventHandler(event) |
248 | #mw.appendText("%s\n" % event[0]) | 248 | #mw.appendText("%s\n" % event[0]) |
249 | if event[0].startswith('bb.build.Task'): | 249 | if isinstance(event, bb.build.Task): |
250 | mw.appendText("NOTE: %s\n" % event[1]['_message']) | 250 | mw.appendText("NOTE: %s\n" % event._message) |
251 | if event[0].startswith('bb.msg.MsgDebug'): | 251 | if isinstance(event, bb.msg.MsgDebug): |
252 | mw.appendText('DEBUG: ' + event[1]['_message'] + '\n') | 252 | mw.appendText('DEBUG: ' + event._message + '\n') |
253 | if event[0].startswith('bb.msg.MsgNote'): | 253 | if isinstance(event, bb.msg.MsgNote): |
254 | mw.appendText('NOTE: ' + event[1]['_message'] + '\n') | 254 | mw.appendText('NOTE: ' + event._message + '\n') |
255 | if event[0].startswith('bb.msg.MsgWarn'): | 255 | if isinstance(event, bb.msg.MsgWarn): |
256 | mw.appendText('WARNING: ' + event[1]['_message'] + '\n') | 256 | mw.appendText('WARNING: ' + event._message + '\n') |
257 | if event[0].startswith('bb.msg.MsgError'): | 257 | if isinstance(event, bb.msg.MsgError): |
258 | mw.appendText('ERROR: ' + event[1]['_message'] + '\n') | 258 | mw.appendText('ERROR: ' + event._message + '\n') |
259 | if event[0].startswith('bb.msg.MsgFatal'): | 259 | if isinstance(event, bb.msg.MsgFatal): |
260 | mw.appendText('FATAL: ' + event[1]['_message'] + '\n') | 260 | mw.appendText('FATAL: ' + event._message + '\n') |
261 | if event[0].startswith('bb.event.ParseProgress'): | 261 | if isinstance(event, bb.event.ParseProgress): |
262 | x = event[1]['sofar'] | 262 | x = event.sofar |
263 | y = event[1]['total'] | 263 | y = event.total |
264 | if x == y: | 264 | if x == y: |
265 | mw.setStatus("Idle") | 265 | mw.setStatus("Idle") |
266 | mw.appendText("Parsing finished. %d cached, %d parsed, %d skipped, %d masked." | 266 | mw.appendText("Parsing finished. %d cached, %d parsed, %d skipped, %d masked." |
267 | % ( event[1]['cached'], event[1]['parsed'], event[1]['skipped'], event[1]['masked'] )) | 267 | % ( event.cached, event.parsed, event.skipped, event.masked )) |
268 | else: | 268 | else: |
269 | mw.setStatus("Parsing: %s (%04d/%04d) [%2d %%]" % ( parsespin.next(), x, y, x*100/y ) ) | 269 | mw.setStatus("Parsing: %s (%04d/%04d) [%2d %%]" % ( parsespin.next(), x, y, x*100/y ) ) |
270 | # if event[0].startswith('bb.build.TaskFailed'): | 270 | # if isinstance(event, bb.build.TaskFailed): |
271 | # if event[1]['logfile']: | 271 | # if event.logfile: |
272 | # if data.getVar("BBINCLUDELOGS", d): | 272 | # if data.getVar("BBINCLUDELOGS", d): |
273 | # bb.msg.error(bb.msg.domain.Build, "log data follows (%s)" % logfile) | 273 | # bb.msg.error(bb.msg.domain.Build, "log data follows (%s)" % logfile) |
274 | # number_of_lines = data.getVar("BBINCLUDELOGS_LINES", d) | 274 | # number_of_lines = data.getVar("BBINCLUDELOGS_LINES", d) |
@@ -286,13 +286,13 @@ class NCursesUI: | |||
286 | # else: | 286 | # else: |
287 | # bb.msg.error(bb.msg.domain.Build, "see log in %s" % logfile) | 287 | # bb.msg.error(bb.msg.domain.Build, "see log in %s" % logfile) |
288 | 288 | ||
289 | if event[0] == 'bb.command.CookerCommandCompleted': | 289 | if isinstance(event, bb.command.CookerCommandCompleted): |
290 | exitflag = True | 290 | exitflag = True |
291 | if event[0] == 'bb.command.CookerCommandFailed': | 291 | if isinstance(event, bb.command.CookerCommandFailed): |
292 | mw.appendText("Command execution failed: %s" % event[1]['error']) | 292 | mw.appendText("Command execution failed: %s" % event.error) |
293 | time.sleep(2) | 293 | time.sleep(2) |
294 | exitflag = True | 294 | exitflag = True |
295 | if event[0] == 'bb.cooker.CookerExit': | 295 | if isinstance(event, bb.cooker.CookerExit): |
296 | exitflag = True | 296 | exitflag = True |
297 | 297 | ||
298 | if helper.needUpdate: | 298 | if helper.needUpdate: |