[pkg-fso-commits] [SCM] Various useful tools for an FSO installation branch, master, updated. debian/0.git20080812.2-32-gb5a13bb

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit fdcd40b90376cd9ae3bcd7ce1ecf55f2735bef9c
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Sat Sep 19 18:10:16 2009 +0200

    mdbus: show actual dbus error message, not just the error name
    Release as 1.0.0 (yay!)

diff --git a/mickeydbus/TODO b/mickeydbus/TODO
index 64149a4..e0d62a1 100644
--- a/mickeydbus/TODO
+++ b/mickeydbus/TODO
@@ -1,8 +1,5 @@
-for 1.0:
- * fix bugs
- * before starting to listen, check out whether the requested busname/objname actually exists
-
 for 1.1:
+ * before starting to listen, check out whether the requested busname/objname actually exists
  * improve usability for scripting
  * mode to simplify output
  * mode to wait for a signal, then dump via stdout
diff --git a/mickeydbus/mdbus b/mickeydbus/mdbus
index 00feee0..07d3a9a 100755
--- a/mickeydbus/mdbus
+++ b/mickeydbus/mdbus
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 """
 Mickey's own dbus introspection utility.
 
@@ -7,7 +8,7 @@ Mickey's own dbus introspection utility.
 GPLv2 or later
 """
 
-__version__ = "0.9.9.10"
+__version__ = "1.0.0"
 
 from xml.parsers.expat import ExpatError, ParserCreate
 from dbus.exceptions import IntrospectionParserException
@@ -253,7 +254,7 @@ class Commands( object ):
             try:
                 result = method( timeout=100000, *parameters )
             except dbus.DBusException, e:
-                print "%s: %s failed: %s" % ( objname, methodname, e.get_dbus_name() )
+                print "%s: %s failed: %s (%s)" % ( objname, methodname, e.get_dbus_name(), e.get_dbus_message() )
             except TypeError, e:
                 pass # python will emit its own error here
             else:
@@ -483,4 +484,4 @@ if __name__ == "__main__":
             else:
                 parameters.append( parameter )
 
-        c.callMethod( busname, objname, methodname, parameters )
+            c.callMethod( busname, objname, methodname, parameters )

-- 
Various useful tools for an FSO installation