# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1410204201 -7200
# Node ID bf2927e6a0f5b67ece07dfd9542b568fdeb0da4d
# Parent  eb1144a22e20ca070d6bedfc99fc542cd036d78e
frontends (dbus): error is not truncated anymore if it's not a SàT error.

diff -r eb1144a22e20 -r bf2927e6a0f5 frontends/src/bridge/DBus.py
--- a/frontends/src/bridge/DBus.py	Mon Sep 08 21:23:18 2014 +0200
+++ b/frontends/src/bridge/DBus.py	Mon Sep 08 21:23:21 2014 +0200
@@ -43,7 +43,11 @@
     @param dbus_e (DBusException)
     @return: BridgeException
     """
-    name = dbus_e.get_dbus_name()[len(const_ERROR_PREFIX) + 1:]
+    full_name = dbus_e.get_dbus_name()
+    if full_name.startswith(const_ERROR_PREFIX):
+        name = dbus_e.get_dbus_name()[len(const_ERROR_PREFIX) + 1:]
+    else:
+        name = full_name
     # XXX: dbus_e.args doesn't contain the original DBusException args, but we
     # receive its serialized form in dbus_e.args[0]. From that we can rebuild
     # the original arguments list thanks to ast.literal_eval (secure eval).
diff -r eb1144a22e20 -r bf2927e6a0f5 src/bridge/bridge_constructor/dbus_frontend_template.py
--- a/src/bridge/bridge_constructor/dbus_frontend_template.py	Mon Sep 08 21:23:18 2014 +0200
+++ b/src/bridge/bridge_constructor/dbus_frontend_template.py	Mon Sep 08 21:23:21 2014 +0200
@@ -43,7 +43,11 @@
     @param dbus_e (DBusException)
     @return: BridgeException
     """
-    name = dbus_e.get_dbus_name()[len(const_ERROR_PREFIX) + 1:]
+    full_name = dbus_e.get_dbus_name()
+    if full_name.startswith(const_ERROR_PREFIX):
+        name = dbus_e.get_dbus_name()[len(const_ERROR_PREFIX) + 1:]
+    else:
+        name = full_name
     # XXX: dbus_e.args doesn't contain the original DBusException args, but we
     # receive its serialized form in dbus_e.args[0]. From that we can rebuild
     # the original arguments list thanks to ast.literal_eval (secure eval).