diff options
Diffstat (limited to 'bitbake/lib/bb/ui/ncurses.py')
-rw-r--r-- | bitbake/lib/bb/ui/ncurses.py | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/bitbake/lib/bb/ui/ncurses.py b/bitbake/lib/bb/ui/ncurses.py index 8524446d22..896ed01a78 100644 --- a/bitbake/lib/bb/ui/ncurses.py +++ b/bitbake/lib/bb/ui/ncurses.py | |||
@@ -230,15 +230,18 @@ class NCursesUI: | |||
230 | shutdown = 0 | 230 | shutdown = 0 |
231 | 231 | ||
232 | try: | 232 | try: |
233 | cmdline = server.runCommand(["getCmdLineAction"]) | 233 | cmdline, error = server.runCommand(["getCmdLineAction"]) |
234 | if not cmdline: | 234 | if not cmdline: |
235 | print("Nothing to do. Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information.") | 235 | print("Nothing to do. Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information.") |
236 | return | 236 | return |
237 | elif not cmdline['action']: | 237 | elif error: |
238 | print(cmdline['msg']) | 238 | print("Error getting bitbake commandline: %s" % error) |
239 | return | 239 | return |
240 | ret = server.runCommand(cmdline['action']) | 240 | ret, error = server.runCommand(cmdline) |
241 | if ret != True: | 241 | if error: |
242 | print("Error running command '%s': %s" % (cmdline, error)) | ||
243 | return | ||
244 | elif ret != True: | ||
242 | print("Couldn't get default commandlind! %s" % ret) | 245 | print("Couldn't get default commandlind! %s" % ret) |
243 | return | 246 | return |
244 | except xmlrpclib.Fault as x: | 247 | except xmlrpclib.Fault as x: |
@@ -337,10 +340,14 @@ class NCursesUI: | |||
337 | exitflag = True | 340 | exitflag = True |
338 | if shutdown == 1: | 341 | if shutdown == 1: |
339 | mw.appendText("Second Keyboard Interrupt, stopping...\n") | 342 | mw.appendText("Second Keyboard Interrupt, stopping...\n") |
340 | server.runCommand(["stateStop"]) | 343 | _, error = server.runCommand(["stateStop"]) |
344 | if error: | ||
345 | print("Unable to cleanly stop: %s" % error) | ||
341 | if shutdown == 0: | 346 | if shutdown == 0: |
342 | mw.appendText("Keyboard Interrupt, closing down...\n") | 347 | mw.appendText("Keyboard Interrupt, closing down...\n") |
343 | server.runCommand(["stateShutdown"]) | 348 | _, error = server.runCommand(["stateShutdown"]) |
349 | if error: | ||
350 | print("Unable to cleanly shutdown: %s" % error) | ||
344 | shutdown = shutdown + 1 | 351 | shutdown = shutdown + 1 |
345 | pass | 352 | pass |
346 | 353 | ||