Reorganize the main exception handling so an attribute exception raised in the ui isn't misinterpreted
(Bitbake rev: 49b8bab706c59e93287f8540187b62ba3ece0a11) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
parent
1b6af2787e
commit
75d49840cf
|
@ -87,7 +87,7 @@ warnings.simplefilter("ignore", DeprecationWarning)
|
||||||
#============================================================================#
|
#============================================================================#
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
return_value = 0
|
return_value = 1
|
||||||
|
|
||||||
parser = optparse.OptionParser(
|
parser = optparse.OptionParser(
|
||||||
version = "BitBake Build Tool Core version %s, %%prog version %s" % (bb.__version__, __version__),
|
version = "BitBake Build Tool Core version %s, %%prog version %s" % (bb.__version__, __version__),
|
||||||
|
@ -201,13 +201,16 @@ Default BBFILES are the .bb files in the current directory.""")
|
||||||
# suggest a fixed set this allows you to have flexibility in which
|
# suggest a fixed set this allows you to have flexibility in which
|
||||||
# ones are available.
|
# ones are available.
|
||||||
uimodule = __import__("bb.ui", fromlist = [ui])
|
uimodule = __import__("bb.ui", fromlist = [ui])
|
||||||
return_value = getattr(uimodule, ui).init(serverConnection.connection, serverConnection.events)
|
ui_init = getattr(uimodule, ui).init
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
print "FATAL: Invalid user interface '%s' specified. " % ui
|
print "FATAL: Invalid user interface '%s' specified. " % ui
|
||||||
print "Valid interfaces are 'ncurses', 'depexp' or the default, 'knotty'."
|
print "Valid interfaces are 'ncurses', 'depexp' or the default, 'knotty'."
|
||||||
except Exception, e:
|
else:
|
||||||
print "FATAL: Unable to start to '%s' UI: %s" % (configuration.ui, e)
|
try:
|
||||||
raise
|
return_value = ui_init(serverConnection.connection, serverConnection.events)
|
||||||
|
except Exception, e:
|
||||||
|
print "FATAL: Unable to start to '%s' UI: %s" % (ui, e)
|
||||||
|
raise
|
||||||
finally:
|
finally:
|
||||||
serverConnection.terminate()
|
serverConnection.terminate()
|
||||||
return return_value
|
return return_value
|
||||||
|
|
Loading…
Reference in New Issue