From: david-sarah <david-sarah@jacaranda.org>
Date: Sun, 20 May 2012 15:35:29 +0000 (+0000)
Subject: Catch exceptions from CLI in order to prevent the Ubuntu crash monolog from triggerin... 
X-Git-Url: https://git.rkrishnan.org/junkers?a=commitdiff_plain;h=2ee1bc7148d45719e5ea86abf1f368d17ae76c2a;p=tahoe-lafs%2Ftahoe-lafs.git

Catch exceptions from CLI in order to prevent the Ubuntu crash monolog from triggering. refs #1746
---

diff --git a/src/allmydata/scripts/runner.py b/src/allmydata/scripts/runner.py
index e66f8d33..210efb65 100644
--- a/src/allmydata/scripts/runner.py
+++ b/src/allmydata/scripts/runner.py
@@ -109,9 +109,15 @@ def runner(argv,
 
 
 def run(install_node_control=True):
-    if sys.platform == "win32":
-        from allmydata.windows.fixups import initialize
-        initialize()
+    try:
+        if sys.platform == "win32":
+            from allmydata.windows.fixups import initialize
+            initialize()
+
+        rc = runner(sys.argv[1:], install_node_control=install_node_control)
+    except Exception:
+        import traceback
+        traceback.print_exc()
+        rc = 1
 
-    rc = runner(sys.argv[1:], install_node_control=install_node_control)
     sys.exit(rc)