2008-09-30 15:08:33 +00:00
|
|
|
#
|
|
|
|
# BitBake Graphical GTK based Dependency Explorer
|
|
|
|
#
|
|
|
|
# Copyright (C) 2007 Ross Burton
|
|
|
|
# Copyright (C) 2007 - 2008 Richard Purdie
|
|
|
|
#
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
|
|
# it under the terms of the GNU General Public License version 2 as
|
|
|
|
# published by the Free Software Foundation.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License along
|
|
|
|
# with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
|
|
|
|
import gobject
|
|
|
|
import gtk
|
2010-12-17 15:20:39 +00:00
|
|
|
import Queue
|
2008-09-30 15:08:33 +00:00
|
|
|
import threading
|
2009-05-11 21:59:35 +00:00
|
|
|
import xmlrpclib
|
2010-12-10 23:53:19 +00:00
|
|
|
import bb
|
|
|
|
import bb.event
|
2012-06-19 09:39:18 +00:00
|
|
|
from bb.ui.crumbs.progressbar import HobProgressBar
|
2008-09-30 15:08:33 +00:00
|
|
|
|
|
|
|
# Package Model
|
|
|
|
(COL_PKG_NAME) = (0)
|
|
|
|
|
|
|
|
# Dependency Model
|
|
|
|
(TYPE_DEP, TYPE_RDEP) = (0, 1)
|
|
|
|
(COL_DEP_TYPE, COL_DEP_PARENT, COL_DEP_PACKAGE) = (0, 1, 2)
|
|
|
|
|
2010-12-17 15:20:39 +00:00
|
|
|
|
2008-09-30 15:08:33 +00:00
|
|
|
class PackageDepView(gtk.TreeView):
|
|
|
|
def __init__(self, model, dep_type, label):
|
|
|
|
gtk.TreeView.__init__(self)
|
|
|
|
self.current = None
|
|
|
|
self.dep_type = dep_type
|
|
|
|
self.filter_model = model.filter_new()
|
|
|
|
self.filter_model.set_visible_func(self._filter)
|
|
|
|
self.set_model(self.filter_model)
|
|
|
|
#self.connect("row-activated", self.on_package_activated, COL_DEP_PACKAGE)
|
|
|
|
self.append_column(gtk.TreeViewColumn(label, gtk.CellRendererText(), text=COL_DEP_PACKAGE))
|
|
|
|
|
|
|
|
def _filter(self, model, iter):
|
|
|
|
(this_type, package) = model.get(iter, COL_DEP_TYPE, COL_DEP_PARENT)
|
|
|
|
if this_type != self.dep_type: return False
|
|
|
|
return package == self.current
|
|
|
|
|
|
|
|
def set_current_package(self, package):
|
|
|
|
self.current = package
|
|
|
|
self.filter_model.refilter()
|
|
|
|
|
2010-12-17 15:20:39 +00:00
|
|
|
|
2008-09-30 15:08:33 +00:00
|
|
|
class PackageReverseDepView(gtk.TreeView):
|
|
|
|
def __init__(self, model, label):
|
|
|
|
gtk.TreeView.__init__(self)
|
|
|
|
self.current = None
|
|
|
|
self.filter_model = model.filter_new()
|
|
|
|
self.filter_model.set_visible_func(self._filter)
|
|
|
|
self.set_model(self.filter_model)
|
|
|
|
self.append_column(gtk.TreeViewColumn(label, gtk.CellRendererText(), text=COL_DEP_PARENT))
|
|
|
|
|
|
|
|
def _filter(self, model, iter):
|
|
|
|
package = model.get_value(iter, COL_DEP_PACKAGE)
|
|
|
|
return package == self.current
|
|
|
|
|
|
|
|
def set_current_package(self, package):
|
|
|
|
self.current = package
|
|
|
|
self.filter_model.refilter()
|
|
|
|
|
2010-12-17 15:20:39 +00:00
|
|
|
|
2008-09-30 15:08:33 +00:00
|
|
|
class DepExplorer(gtk.Window):
|
|
|
|
def __init__(self):
|
|
|
|
gtk.Window.__init__(self)
|
|
|
|
self.set_title("Dependency Explorer")
|
|
|
|
self.set_default_size(500, 500)
|
|
|
|
self.connect("delete-event", gtk.main_quit)
|
|
|
|
|
|
|
|
# Create the data models
|
|
|
|
self.pkg_model = gtk.ListStore(gobject.TYPE_STRING)
|
2010-12-21 13:12:21 +00:00
|
|
|
self.pkg_model.set_sort_column_id(COL_PKG_NAME, gtk.SORT_ASCENDING)
|
2008-09-30 15:08:33 +00:00
|
|
|
self.depends_model = gtk.ListStore(gobject.TYPE_INT, gobject.TYPE_STRING, gobject.TYPE_STRING)
|
2010-12-21 13:12:21 +00:00
|
|
|
self.depends_model.set_sort_column_id(COL_DEP_PACKAGE, gtk.SORT_ASCENDING)
|
2008-09-30 15:08:33 +00:00
|
|
|
|
|
|
|
pane = gtk.HPaned()
|
|
|
|
pane.set_position(250)
|
|
|
|
self.add(pane)
|
|
|
|
|
|
|
|
# The master list of packages
|
|
|
|
scrolled = gtk.ScrolledWindow()
|
|
|
|
scrolled.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
|
|
|
|
scrolled.set_shadow_type(gtk.SHADOW_IN)
|
2010-12-17 15:20:39 +00:00
|
|
|
|
2008-09-30 15:08:33 +00:00
|
|
|
self.pkg_treeview = gtk.TreeView(self.pkg_model)
|
|
|
|
self.pkg_treeview.get_selection().connect("changed", self.on_cursor_changed)
|
2010-12-17 15:20:39 +00:00
|
|
|
column = gtk.TreeViewColumn("Package", gtk.CellRendererText(), text=COL_PKG_NAME)
|
|
|
|
self.pkg_treeview.append_column(column)
|
2008-09-30 15:08:33 +00:00
|
|
|
pane.add1(scrolled)
|
|
|
|
scrolled.add(self.pkg_treeview)
|
|
|
|
|
|
|
|
box = gtk.VBox(homogeneous=True, spacing=4)
|
|
|
|
|
|
|
|
# Runtime Depends
|
|
|
|
scrolled = gtk.ScrolledWindow()
|
|
|
|
scrolled.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
|
|
|
|
scrolled.set_shadow_type(gtk.SHADOW_IN)
|
|
|
|
self.rdep_treeview = PackageDepView(self.depends_model, TYPE_RDEP, "Runtime Depends")
|
|
|
|
self.rdep_treeview.connect("row-activated", self.on_package_activated, COL_DEP_PACKAGE)
|
|
|
|
scrolled.add(self.rdep_treeview)
|
|
|
|
box.add(scrolled)
|
|
|
|
|
|
|
|
# Build Depends
|
|
|
|
scrolled = gtk.ScrolledWindow()
|
|
|
|
scrolled.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
|
|
|
|
scrolled.set_shadow_type(gtk.SHADOW_IN)
|
|
|
|
self.dep_treeview = PackageDepView(self.depends_model, TYPE_DEP, "Build Depends")
|
|
|
|
self.dep_treeview.connect("row-activated", self.on_package_activated, COL_DEP_PACKAGE)
|
|
|
|
scrolled.add(self.dep_treeview)
|
|
|
|
box.add(scrolled)
|
|
|
|
pane.add2(box)
|
|
|
|
|
|
|
|
# Reverse Depends
|
|
|
|
scrolled = gtk.ScrolledWindow()
|
|
|
|
scrolled.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
|
|
|
|
scrolled.set_shadow_type(gtk.SHADOW_IN)
|
|
|
|
self.revdep_treeview = PackageReverseDepView(self.depends_model, "Reverse Depends")
|
|
|
|
self.revdep_treeview.connect("row-activated", self.on_package_activated, COL_DEP_PARENT)
|
|
|
|
scrolled.add(self.revdep_treeview)
|
|
|
|
box.add(scrolled)
|
|
|
|
pane.add2(box)
|
|
|
|
|
|
|
|
self.show_all()
|
|
|
|
|
|
|
|
def on_package_activated(self, treeview, path, column, data_col):
|
|
|
|
model = treeview.get_model()
|
|
|
|
package = model.get_value(model.get_iter(path), data_col)
|
|
|
|
|
|
|
|
pkg_path = []
|
|
|
|
def finder(model, path, iter, needle):
|
|
|
|
package = model.get_value(iter, COL_PKG_NAME)
|
|
|
|
if package == needle:
|
|
|
|
pkg_path.append(path)
|
|
|
|
return True
|
|
|
|
else:
|
|
|
|
return False
|
|
|
|
self.pkg_model.foreach(finder, package)
|
|
|
|
if pkg_path:
|
|
|
|
self.pkg_treeview.get_selection().select_path(pkg_path[0])
|
|
|
|
self.pkg_treeview.scroll_to_cell(pkg_path[0])
|
|
|
|
|
|
|
|
def on_cursor_changed(self, selection):
|
|
|
|
(model, it) = selection.get_selected()
|
2013-08-05 15:39:47 +00:00
|
|
|
if it is None:
|
2008-09-30 15:08:33 +00:00
|
|
|
current_package = None
|
|
|
|
else:
|
|
|
|
current_package = model.get_value(it, COL_PKG_NAME)
|
|
|
|
self.rdep_treeview.set_current_package(current_package)
|
|
|
|
self.dep_treeview.set_current_package(current_package)
|
|
|
|
self.revdep_treeview.set_current_package(current_package)
|
|
|
|
|
|
|
|
|
2013-08-05 15:16:32 +00:00
|
|
|
def parse(self, depgraph):
|
|
|
|
for package in depgraph["pn"]:
|
2013-08-05 15:22:11 +00:00
|
|
|
self.pkg_model.insert(0, (package,))
|
2008-09-30 15:08:33 +00:00
|
|
|
|
2013-08-05 15:16:32 +00:00
|
|
|
for package in depgraph["depends"]:
|
|
|
|
for depend in depgraph["depends"][package]:
|
2013-08-05 15:22:11 +00:00
|
|
|
self.depends_model.insert (0, (TYPE_DEP, package, depend))
|
2008-09-30 15:08:33 +00:00
|
|
|
|
2013-08-05 15:16:32 +00:00
|
|
|
for package in depgraph["rdepends-pn"]:
|
|
|
|
for rdepend in depgraph["rdepends-pn"][package]:
|
2013-08-05 15:22:11 +00:00
|
|
|
self.depends_model.insert (0, (TYPE_RDEP, package, rdepend))
|
2008-09-30 15:08:33 +00:00
|
|
|
|
2010-12-17 15:20:39 +00:00
|
|
|
|
2008-09-30 15:08:33 +00:00
|
|
|
class gtkthread(threading.Thread):
|
|
|
|
quit = threading.Event()
|
|
|
|
def __init__(self, shutdown):
|
|
|
|
threading.Thread.__init__(self)
|
|
|
|
self.setDaemon(True)
|
|
|
|
self.shutdown = shutdown
|
|
|
|
|
|
|
|
def run(self):
|
|
|
|
gobject.threads_init()
|
|
|
|
gtk.gdk.threads_init()
|
|
|
|
gtk.main()
|
|
|
|
gtkthread.quit.set()
|
|
|
|
|
|
|
|
|
2013-05-20 21:54:41 +00:00
|
|
|
def main(server, eventHandler, params):
|
2008-09-30 15:08:33 +00:00
|
|
|
try:
|
2013-05-20 21:54:41 +00:00
|
|
|
params.updateFromServer(server)
|
|
|
|
cmdline = params.parseActions()
|
|
|
|
if not cmdline:
|
bitbake: command: add error to return of runCommand
Currently, command.py can return an error message from runCommand, due to
being unable to run the command, yet few of our UIs (just hob) can handle it
today. This can result in seeing a TypeError with traceback in certain rare
circumstances.
To resolve this, we need a clean way to get errors back from runCommand,
without having to isinstance() the return value. This implements such a thing
by making runCommand also return an error (or None if no error occurred).
As runCommand now has a method of returning errors, we can also alter the
getCmdLineAction bits such that the returned value is just the action, not an
additional message. If a sync command wants to return an error, it raises
CommandError(message), and the message will be passed to the caller
appropriately.
Example Usage:
result, error = server.runCommand(...)
if error:
log.error('Unable to run command: %s' % error)
return 1
(Bitbake rev: 717831b8315cb3904d9b590e633000bc897e8fb6)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-29 20:01:23 +00:00
|
|
|
print("Nothing to do. Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information.")
|
|
|
|
return 1
|
2013-05-20 21:54:41 +00:00
|
|
|
if 'msg' in cmdline and cmdline['msg']:
|
|
|
|
logger.error(cmdline['msg'])
|
|
|
|
return 1
|
|
|
|
cmdline = cmdline['action']
|
|
|
|
if not cmdline or cmdline[0] != "generateDotGraph":
|
2010-04-10 02:46:14 +00:00
|
|
|
print("This UI is only compatible with the -g option")
|
bitbake: command: add error to return of runCommand
Currently, command.py can return an error message from runCommand, due to
being unable to run the command, yet few of our UIs (just hob) can handle it
today. This can result in seeing a TypeError with traceback in certain rare
circumstances.
To resolve this, we need a clean way to get errors back from runCommand,
without having to isinstance() the return value. This implements such a thing
by making runCommand also return an error (or None if no error occurred).
As runCommand now has a method of returning errors, we can also alter the
getCmdLineAction bits such that the returned value is just the action, not an
additional message. If a sync command wants to return an error, it raises
CommandError(message), and the message will be passed to the caller
appropriately.
Example Usage:
result, error = server.runCommand(...)
if error:
log.error('Unable to run command: %s' % error)
return 1
(Bitbake rev: 717831b8315cb3904d9b590e633000bc897e8fb6)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-29 20:01:23 +00:00
|
|
|
return 1
|
|
|
|
ret, error = server.runCommand(["generateDepTreeEvent", cmdline[1], cmdline[2]])
|
|
|
|
if error:
|
|
|
|
print("Error running command '%s': %s" % (cmdline, error))
|
|
|
|
return 1
|
|
|
|
elif ret != True:
|
|
|
|
print("Error running command '%s': returned %s" % (cmdline, ret))
|
|
|
|
return 1
|
2010-04-12 00:03:55 +00:00
|
|
|
except xmlrpclib.Fault as x:
|
2010-04-10 02:46:14 +00:00
|
|
|
print("XMLRPC Fault getting commandline:\n %s" % x)
|
2008-09-30 15:08:33 +00:00
|
|
|
return
|
|
|
|
|
|
|
|
shutdown = 0
|
|
|
|
|
|
|
|
gtkgui = gtkthread(shutdown)
|
|
|
|
gtkgui.start()
|
|
|
|
|
|
|
|
gtk.gdk.threads_enter()
|
|
|
|
dep = DepExplorer()
|
2012-09-27 15:46:09 +00:00
|
|
|
bardialog = gtk.Dialog(parent=dep,
|
|
|
|
flags=gtk.DIALOG_MODAL|gtk.DIALOG_DESTROY_WITH_PARENT)
|
2012-06-19 09:39:18 +00:00
|
|
|
bardialog.set_default_size(400, 50)
|
|
|
|
pbar = HobProgressBar()
|
|
|
|
bardialog.vbox.pack_start(pbar)
|
|
|
|
bardialog.show_all()
|
|
|
|
bardialog.connect("delete-event", gtk.main_quit)
|
2008-09-30 15:08:33 +00:00
|
|
|
gtk.gdk.threads_leave()
|
|
|
|
|
2010-12-17 15:20:39 +00:00
|
|
|
progress_total = 0
|
2008-09-30 15:08:33 +00:00
|
|
|
while True:
|
|
|
|
try:
|
|
|
|
event = eventHandler.waitEvent(0.25)
|
|
|
|
if gtkthread.quit.isSet():
|
bitbake: command: add error to return of runCommand
Currently, command.py can return an error message from runCommand, due to
being unable to run the command, yet few of our UIs (just hob) can handle it
today. This can result in seeing a TypeError with traceback in certain rare
circumstances.
To resolve this, we need a clean way to get errors back from runCommand,
without having to isinstance() the return value. This implements such a thing
by making runCommand also return an error (or None if no error occurred).
As runCommand now has a method of returning errors, we can also alter the
getCmdLineAction bits such that the returned value is just the action, not an
additional message. If a sync command wants to return an error, it raises
CommandError(message), and the message will be passed to the caller
appropriately.
Example Usage:
result, error = server.runCommand(...)
if error:
log.error('Unable to run command: %s' % error)
return 1
(Bitbake rev: 717831b8315cb3904d9b590e633000bc897e8fb6)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-29 20:01:23 +00:00
|
|
|
_, error = server.runCommand(["stateStop"])
|
|
|
|
if error:
|
|
|
|
print('Unable to cleanly stop: %s' % error)
|
2008-09-30 15:08:33 +00:00
|
|
|
break
|
|
|
|
|
|
|
|
if event is None:
|
|
|
|
continue
|
2010-12-17 15:20:39 +00:00
|
|
|
|
|
|
|
if isinstance(event, bb.event.CacheLoadStarted):
|
|
|
|
progress_total = event.total
|
|
|
|
gtk.gdk.threads_enter()
|
2012-06-19 09:39:18 +00:00
|
|
|
bardialog.set_title("Loading Cache")
|
|
|
|
pbar.update(0)
|
2010-12-17 15:20:39 +00:00
|
|
|
gtk.gdk.threads_leave()
|
|
|
|
|
|
|
|
if isinstance(event, bb.event.CacheLoadProgress):
|
|
|
|
x = event.current
|
|
|
|
gtk.gdk.threads_enter()
|
2012-06-19 09:39:18 +00:00
|
|
|
pbar.update(x * 1.0 / progress_total)
|
|
|
|
pbar.set_title('')
|
2010-12-17 15:20:39 +00:00
|
|
|
gtk.gdk.threads_leave()
|
|
|
|
continue
|
|
|
|
|
|
|
|
if isinstance(event, bb.event.CacheLoadCompleted):
|
2012-06-19 09:39:18 +00:00
|
|
|
bardialog.hide()
|
2010-12-17 15:20:39 +00:00
|
|
|
continue
|
|
|
|
|
|
|
|
if isinstance(event, bb.event.ParseStarted):
|
|
|
|
progress_total = event.total
|
2011-05-11 00:07:56 +00:00
|
|
|
if progress_total == 0:
|
|
|
|
continue
|
2010-12-17 15:20:39 +00:00
|
|
|
gtk.gdk.threads_enter()
|
2012-06-19 09:39:18 +00:00
|
|
|
pbar.update(0)
|
|
|
|
bardialog.set_title("Processing recipes")
|
|
|
|
|
2010-12-17 15:20:39 +00:00
|
|
|
gtk.gdk.threads_leave()
|
|
|
|
|
2010-01-19 14:48:19 +00:00
|
|
|
if isinstance(event, bb.event.ParseProgress):
|
2010-12-17 15:20:39 +00:00
|
|
|
x = event.current
|
2008-09-30 15:08:33 +00:00
|
|
|
gtk.gdk.threads_enter()
|
2012-06-19 09:39:18 +00:00
|
|
|
pbar.update(x * 1.0 / progress_total)
|
|
|
|
pbar.set_title('')
|
2008-09-30 15:08:33 +00:00
|
|
|
gtk.gdk.threads_leave()
|
2010-12-17 15:20:39 +00:00
|
|
|
continue
|
|
|
|
|
|
|
|
if isinstance(event, bb.event.ParseCompleted):
|
2012-06-19 09:39:18 +00:00
|
|
|
bardialog.hide()
|
2008-09-30 15:08:33 +00:00
|
|
|
continue
|
|
|
|
|
2010-01-19 14:48:19 +00:00
|
|
|
if isinstance(event, bb.event.DepTreeGenerated):
|
2008-09-30 15:08:33 +00:00
|
|
|
gtk.gdk.threads_enter()
|
2013-08-05 15:16:32 +00:00
|
|
|
dep.parse(event._depgraph)
|
2008-09-30 15:08:33 +00:00
|
|
|
gtk.gdk.threads_leave()
|
|
|
|
|
2010-12-10 23:53:19 +00:00
|
|
|
if isinstance(event, bb.command.CommandCompleted):
|
2008-09-30 15:08:33 +00:00
|
|
|
continue
|
2010-12-17 15:20:39 +00:00
|
|
|
|
2010-12-10 23:53:19 +00:00
|
|
|
if isinstance(event, bb.command.CommandFailed):
|
2010-04-10 02:46:14 +00:00
|
|
|
print("Command execution failed: %s" % event.error)
|
2010-12-10 23:53:19 +00:00
|
|
|
return event.exitcode
|
2010-12-17 15:20:39 +00:00
|
|
|
|
2010-12-10 23:53:19 +00:00
|
|
|
if isinstance(event, bb.command.CommandExit):
|
|
|
|
return event.exitcode
|
2010-12-17 15:20:39 +00:00
|
|
|
|
2010-01-19 14:48:19 +00:00
|
|
|
if isinstance(event, bb.cooker.CookerExit):
|
2008-09-30 15:08:33 +00:00
|
|
|
break
|
|
|
|
|
|
|
|
continue
|
2010-12-17 15:20:39 +00:00
|
|
|
except EnvironmentError as ioerror:
|
|
|
|
# ignore interrupted io
|
|
|
|
if ioerror.args[0] == 4:
|
|
|
|
pass
|
2008-09-30 15:08:33 +00:00
|
|
|
except KeyboardInterrupt:
|
|
|
|
if shutdown == 2:
|
2010-04-10 02:46:14 +00:00
|
|
|
print("\nThird Keyboard Interrupt, exit.\n")
|
2008-09-30 15:08:33 +00:00
|
|
|
break
|
|
|
|
if shutdown == 1:
|
2010-04-10 02:46:14 +00:00
|
|
|
print("\nSecond Keyboard Interrupt, stopping...\n")
|
2013-09-13 16:31:54 +00:00
|
|
|
_, error = server.runCommand(["stateForceShutdown"])
|
bitbake: command: add error to return of runCommand
Currently, command.py can return an error message from runCommand, due to
being unable to run the command, yet few of our UIs (just hob) can handle it
today. This can result in seeing a TypeError with traceback in certain rare
circumstances.
To resolve this, we need a clean way to get errors back from runCommand,
without having to isinstance() the return value. This implements such a thing
by making runCommand also return an error (or None if no error occurred).
As runCommand now has a method of returning errors, we can also alter the
getCmdLineAction bits such that the returned value is just the action, not an
additional message. If a sync command wants to return an error, it raises
CommandError(message), and the message will be passed to the caller
appropriately.
Example Usage:
result, error = server.runCommand(...)
if error:
log.error('Unable to run command: %s' % error)
return 1
(Bitbake rev: 717831b8315cb3904d9b590e633000bc897e8fb6)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-29 20:01:23 +00:00
|
|
|
if error:
|
|
|
|
print('Unable to cleanly stop: %s' % error)
|
2008-09-30 15:08:33 +00:00
|
|
|
if shutdown == 0:
|
2010-04-10 02:46:14 +00:00
|
|
|
print("\nKeyboard Interrupt, closing down...\n")
|
bitbake: command: add error to return of runCommand
Currently, command.py can return an error message from runCommand, due to
being unable to run the command, yet few of our UIs (just hob) can handle it
today. This can result in seeing a TypeError with traceback in certain rare
circumstances.
To resolve this, we need a clean way to get errors back from runCommand,
without having to isinstance() the return value. This implements such a thing
by making runCommand also return an error (or None if no error occurred).
As runCommand now has a method of returning errors, we can also alter the
getCmdLineAction bits such that the returned value is just the action, not an
additional message. If a sync command wants to return an error, it raises
CommandError(message), and the message will be passed to the caller
appropriately.
Example Usage:
result, error = server.runCommand(...)
if error:
log.error('Unable to run command: %s' % error)
return 1
(Bitbake rev: 717831b8315cb3904d9b590e633000bc897e8fb6)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-29 20:01:23 +00:00
|
|
|
_, error = server.runCommand(["stateShutdown"])
|
|
|
|
if error:
|
|
|
|
print('Unable to cleanly shutdown: %s' % error)
|
2008-09-30 15:08:33 +00:00
|
|
|
shutdown = shutdown + 1
|
|
|
|
pass
|