From 3d1cd783ecc1c466d3d889fce4d3ab65c44d43d8 Mon Sep 17 00:00:00 2001
From: Brennan Novak <hi@bnvk.me>
Date: Mon, 9 Nov 2015 23:19:44 +0100
Subject: [PATCH] exception popup message now shows exc_type sometimes

fixes: QubesOS/qubes-issues#1394
---
 qubesmanager/main.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/qubesmanager/main.py b/qubesmanager/main.py
index 5d1d262..462dc07 100755
--- a/qubesmanager/main.py
+++ b/qubesmanager/main.py
@@ -1985,8 +1985,10 @@ def handle_exception(exc_type, exc_value, exc_traceback):
 
     filename, line, dummy, dummy = traceback.extract_tb(exc_traceback).pop()
     filename = os.path.basename(filename)
+    error = "%s: %s" % (exc_type.__name__, exc_value)
+    error = error.replace('QubesException: ', '')
     message = (
-        "<b>%s</b>" % exc_value +
+        "<b>%s</b>" % error +
         "<br><br><i>This is most likely a bug in the Qubes Manager</i>"
     )
     is_gui_thread = threading.currentThread().getName() == "QtMainThread"