shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-12-25 23:21:45 +03:00
Code Issues Projects Releases Wiki Activity

Don't raise startup GTK error before processing CLI args

Browse Source 
--help shouldn't throw an exception if run over ssh with no X11 forwarding
This commit is contained in:
Cole Robinson 2011-03-22 14:30:37 -04:00
parent 8a44ffb9d9
commit ee3e0ba450
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/virt-manager.py.in
View File

@ -322,6 +322,7 @@ def main():
setup_pypath()
# Need to do this before GTK strips args like --sync
gtk_error = None
origargs = " ".join(sys.argv[:])
# Urgh, pygtk merely logs a warning when failing to open
@ -343,12 +344,22 @@ def main():
except Warning, e:
# ...the risk is we catch too much though
# Damned if we do, damned if we dont :-)(
raise RuntimeError(_("Unable to initialize GTK: %s") % str(e))
gtk_error = str(e)
except Exception, e:
gtk_error = e
warnings.resetwarnings()
# Need to parse CLI after import gtk, since gtk strips --sync
(options, ignore) = parse_commandline()
setup_logging(options.debug)
# Only raise this error after parsing the CLI, so users at least
# get --help output and CLI validation
if gtk_error:
if type(gtk_error) is str:
raise RuntimeError(_("Unable to initialize GTK: %s") % gtk_error)
raise gtk_error
setup_logging(options.debug)
logging.debug("Launched as: %s" % origargs)
logging.debug("GTK version: %s" % str(gtk.gtk_version))