diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2008-12-06 13:03:19 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2008-12-06 13:03:19 +0000 |
| commit | 9f5dbcce6fd49383821d5f36fb88d35ddabc613f (patch) | |
| tree | be1c7ff28be3d2441a234712ea1f1e7623c55b58 /lib/bb | |
| parent | a946f9b948adb5046de65ee98c5cdebd803888d5 (diff) | |
| download | bitbake-9f5dbcce6fd49383821d5f36fb88d35ddabc613f.tar.gz | |
Update the UIs against the core changes and allow dynamic loading of the UI so UIs become truly plugable.
Diffstat (limited to 'lib/bb')
| -rw-r--r-- | lib/bb/ui/depexp.py | 2 | ||||
| -rw-r--r-- | lib/bb/ui/knotty.py | 11 | ||||
| -rw-r--r-- | lib/bb/ui/ncurses.py | 5 |
3 files changed, 11 insertions, 7 deletions
diff --git a/lib/bb/ui/depexp.py b/lib/bb/ui/depexp.py index becbb5dd5..9d92fa0a0 100644 --- a/lib/bb/ui/depexp.py +++ b/lib/bb/ui/depexp.py @@ -202,7 +202,7 @@ def init(server, eventHandler): if not cmdline or cmdline[0] != "generateDotGraph": print "This UI is only compatible with the -g option" return - ret = server.runCommand(["generateDepTreeEvent", cmdline[1]]) + ret = server.runCommand(["generateDepTreeEvent", cmdline[1], cmdline[2]]) if ret != True: print "Couldn't run command! %s" % ret return diff --git a/lib/bb/ui/knotty.py b/lib/bb/ui/knotty.py index 0de90a927..a6595df3f 100644 --- a/lib/bb/ui/knotty.py +++ b/lib/bb/ui/knotty.py @@ -56,9 +56,6 @@ def init(server, eventHandler): if event is None: continue #print event - if event[0].startswith('bb.event.Pkg'): - print "NOTE: %s" % event[1]['_message'] - continue if event[0].startswith('bb.msg.MsgPlain'): print event[1]['_message'] continue @@ -75,12 +72,16 @@ def init(server, eventHandler): return_value = 1 print 'ERROR: ' + event[1]['_message'] continue + if event[0].startswith('bb.msg.MsgFatal'): + return_value = 1 + print 'FATAL: ' + event[1]['_message'] + break if event[0].startswith('bb.build.TaskFailed'): return_value = 1 logfile = event[1]['logfile'] if logfile: print "ERROR: Logfile of failure stored in %s." % logfile - if includelogs: + if 1 or includelogs: print "Log data follows:" f = open(logfile, "r") lines = [] @@ -140,6 +141,8 @@ def init(server, eventHandler): continue if event[0].startswith('bb.event.StampUpdate'): continue + if event[0].startswith('bb.event.ConfigParsed'): + continue print "Unknown Event: %s" % event except KeyboardInterrupt: diff --git a/lib/bb/ui/ncurses.py b/lib/bb/ui/ncurses.py index 1476baa61..3cac26464 100644 --- a/lib/bb/ui/ncurses.py +++ b/lib/bb/ui/ncurses.py @@ -245,8 +245,6 @@ class NCursesUI: continue helper.eventHandler(event) #mw.appendText("%s\n" % event[0]) - if event[0].startswith('bb.event.Pkg'): - mw.appendText("NOTE: %s\n" % event[1]['_message']) if event[0].startswith('bb.build.Task'): mw.appendText("NOTE: %s\n" % event[1]['_message']) if event[0].startswith('bb.msg.MsgDebug'): @@ -324,6 +322,9 @@ class NCursesUI: pass def init(server, eventHandler): + if not os.isatty(sys.stdout.fileno()): + print "FATAL: Unable to run 'ncurses' UI without a TTY." + return ui = NCursesUI() try: curses.wrapper(ui.main, server, eventHandler) |