projects
/
dbuscron
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3199277
)
auto_args feature compatile with dbus-scripts args filling
author
Konstantin Stepanov
<kstep@p-nut.info>
Wed, 22 Dec 2010 08:21:23 +0000
(10:21 +0200)
committer
Konstantin Stepanov
<kstep@p-nut.info>
Wed, 22 Dec 2010 08:51:32 +0000
(10:51 +0200)
dbuscron/command.py
patch
|
blob
|
history
diff --git
a/dbuscron/command.py
b/dbuscron/command.py
index
43b0824
..
8ae1989
100644
(file)
--- a/
dbuscron/command.py
+++ b/
dbuscron/command.py
@@
-35,6
+35,8
@@
class Command(object):
DBUS_PATH = str(message.get_path()),
DBUS_MEMBER = str(message.get_member()),
DBUS_BUS = bus.__class__.__name__.lower()[0:-3],
DBUS_PATH = str(message.get_path()),
DBUS_MEMBER = str(message.get_member()),
DBUS_BUS = bus.__class__.__name__.lower()[0:-3],
+ # TODO
+ #DBUS_ERROR = str(message.get_error_name()),
DBUS_TYPE = get_dbus_message_type(message)
)
env.update(dbus_env)
DBUS_TYPE = get_dbus_message_type(message)
)
env.update(dbus_env)
@@
-43,7
+45,18
@@
class Command(object):
raise e
if self.__auto_args:
raise e
if self.__auto_args:
- args_list.insert(0, self.__file)
+ if dbus_env['DBUS_TYPE'] in ('signal', 'method_call'):
+ args_list[0:0] = [
+ dbus_env['DBUS_IFACE'],
+ dbus_env['DBUS_MEMBER']]
+ # TODO
+ #elif dbus_env['DBUS_TYPE'] == 'error':
+ # args_list.insert(0, dbus_env['DBUS_ERROR'])
+
+ args_list[0:0] = [
+ self.__file,
+ dbus_env['DBUS_SENDER'],
+ dbus_env['DBUS_DEST']]
else:
args_list = self.__args
else:
args_list = self.__args