Author: jreidinger Date: Thu Jul 3 18:06:36 2008 New Revision: 48855 URL: http://svn.opensuse.org/viewcvs/yast?rev=48855&view=rev Log: prepare for demonstration Modified: branches/tmp/lslezak/workshop/auth_dbus_layer/auth_layer_service.py branches/tmp/lslezak/workshop/auth_dbus_layer/test.py Modified: branches/tmp/lslezak/workshop/auth_dbus_layer/auth_layer_service.py URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/auth_dbus_layer/auth_layer_service.py?rev=48855&r1=48854&r2=48855&view=diff ============================================================================== --- branches/tmp/lslezak/workshop/auth_dbus_layer/auth_layer_service.py (original) +++ branches/tmp/lslezak/workshop/auth_dbus_layer/auth_layer_service.py Thu Jul 3 18:06:36 2008 @@ -8,6 +8,7 @@ import dbus.service import _dbus_bindings from polkitwrapper import PolkitCheck +from polkitwrapper import validateString from dbus.mainloop.glib import DBusGMainLoop @@ -18,33 +19,33 @@ def __init__(self, object_path): dbus.service.Object.__init__(self, dbus.SystemBus(), object_path="/") - @dbus.service.method(dbus_interface='org.opensuse.YaST.Auth', in_signature='s', out_signature='v', sender_keyword='caller') - def Executepk(self, path, caller=None): - PolkitCheck('org.opensuse.yast'+path+'.execute',caller) + @dbus.service.method(dbus_interface='org.opensuse.YaST.Auth', in_signature='sv', out_signature='v', sender_keyword='caller') + def Executepk(self, path, var, caller=None): + PolkitCheck(validateString('org.opensuse.yast'+path+'.execute'),caller) buss = dbus.SystemBus() yast_SCR = buss.get_object('org.opensuse.YaST', '/') - return yast_SCR.Execute(path, dbus_interface='org.opensuse.YaST') + return yast_SCR.Execute(path, var, dbus_interface='org.opensuse.YaST') - @dbus.service.method(dbus_interface='org.opensuse.YaST.Auth', in_signature='ss', out_signature='v', sender_keyword='caller') + @dbus.service.method(dbus_interface='org.opensuse.YaST.Auth', in_signature='sv', out_signature='v', sender_keyword='caller') def Writepk (self, path, value, caller=None): - PolkitCheck('org.opensuse.yast'+path+'.write',caller) + PolkitCheck(validateString('org.opensuse.yast'+path+'.write'),caller) bus = dbus.SystemBus() yast_SCR = bus.get_object('org.opensuse.YaST', '/') - return yast_SCR.Execute(path, dbus_interface='org.opensuse.YaST') + return yast_SCR.Write(path, value, dbus_interface='org.opensuse.YaST') - @dbus.service.method(dbus_interface='org.opensuse.YaST.Auth', in_signature='s', out_signature='v', sender_keyword='caller') - def Readpk(self, path, caller=None): - PolkitCheck('org.opensuse.yast'+path+'.read',caller) + @dbus.service.method(dbus_interface='org.opensuse.YaST.Auth', in_signature='sv', out_signature='v', sender_keyword='caller') + def Readpk(self, path, var, caller=None): + PolkitCheck(validateString('org.opensuse.yast'+path+'.read'),caller) bus = dbus.SystemBus() yast_SCR = bus.get_object('org.opensuse.YaST', '/') - return yast_SCR.Execute(path, dbus_interface='org.opensuse.YaST') + return yast_SCR.Read(path, var, dbus_interface='org.opensuse.YaST') - @dbus.service.method(dbus_interface='org.opensuse.YaST.Auth', in_signature='s', out_signature='as', sender_keyword='caller') - def Dirpk(self, path, caller=None): - PolkitCheck('org.opensuse.yast'+path+'.dir',caller) + @dbus.service.method(dbus_interface='org.opensuse.YaST.Auth', in_signature='sv', out_signature='as', sender_keyword='caller') + def Dirpk(self, path, var, caller=None): + PolkitCheck(validateString('org.opensuse.yast'+path+'.dir'),caller) buss = dbus.SystemBus() yast_SCR = buss.get_object('org.opensuse.YaST', '/') - return yast_SCR.Execute(path, dbus_interface='org.opensuse.YaST') + return yast_SCR.Dir(path, var, dbus_interface='org.opensuse.YaST') bus = dbus.SystemBus() Modified: branches/tmp/lslezak/workshop/auth_dbus_layer/test.py URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/auth_dbus_layer/test.py?rev=48855&r1=48854&r2=48855&view=diff ============================================================================== --- branches/tmp/lslezak/workshop/auth_dbus_layer/test.py (original) +++ branches/tmp/lslezak/workshop/auth_dbus_layer/test.py Thu Jul 3 18:06:36 2008 @@ -9,10 +9,10 @@ if __name__ == "__main__": try: - print yast_SCR.Dirpk('.sysconfig.kdump', dbus_interface='org.opensuse.YaST.Auth') - except Exception: - print "no permision" - print yast_SCR.Readpk('.time', dbus_interface='org.opensuse.YaST.Auth') + print yast_SCR.Dirpk('.sysconfig.kdump', 'PyNone', dbus_interface='org.opensuse.YaST.Auth') + except Exception, e: + print e.message + print yast_SCR.Readpk('.time', {'format' : '+%z'}, dbus_interface='org.opensuse.YaST.Auth') - print yast_SCR.Readpk('.sysconfig.kdump.KDUMP_COMMANDLINE', dbus_interface='org.opensuse.YaST.Auth') + print yast_SCR.Read('.sysconfig.kdump.KDUMP_COMMANDLINE', 'PyNone', dbus_interface='org.opensuse.YaST') -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org