Author: juhliarik Date: Wed Jul 2 11:01:34 2008 New Revision: 48761 URL: http://svn.opensuse.org/viewcvs/yast?rev=48761&view=rev Log: update... Modified: branches/tmp/lslezak/workshop/scr_dbus/yast_service.py Modified: branches/tmp/lslezak/workshop/scr_dbus/yast_service.py URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/workshop/scr_dbus/yast_service.py?rev=48761&r1=48760&r2=48761&view=diff ============================================================================== --- branches/tmp/lslezak/workshop/scr_dbus/yast_service.py (original) +++ branches/tmp/lslezak/workshop/scr_dbus/yast_service.py Wed Jul 2 11:01:34 2008 @@ -21,19 +21,37 @@ @dbus.service.method(dbus_interface='org.opensuse.YaST', in_signature='s', out_signature='v') def Execute(self, path): - return ycp.SCR.Execute(path) + my_path = convertDbusTypeToPythonType(path) + ret = ycp.SCR.Execute(ycp.Path(my_path)) + if ret == None: + ret = 'PyNone' + return ret + @dbus.service.method(dbus_interface='org.opensuse.YaST', in_signature='sv', out_signature='v') def Write (self, path, value): - return ycp.SCR.Write(path, convertDbusTypeToPythonType(value)) + my_path = convertDbusTypeToPythonType(path) + ret = ycp.SCR.Write(ycp.Path(my_path), convertDbusTypeToPythonType(value)) + if ret == None: + ret = 'PyNone' + return ret + @dbus.service.method(dbus_interface='org.opensuse.YaST', in_signature='s', out_signature='v') def Read(self, path): - return convertDbusTypeToPythonType(ycp.SCR.Read(path)) + my_path = convertDbusTypeToPythonType(path) + ret = ycp.SCR.Read(ycp.Path(my_path)) + if ret == None: + ret = 'PyNone' + return ret @dbus.service.method(dbus_interface='org.opensuse.YaST', in_signature='s', out_signature='as') def Dir(self, path): - return ycp.SCR.Dir(path) + my_path = convertDbusTypeToPythonType(path) + ret = ycp.SCR.Dir(ycp.Path(my_path)) + if ret == None: + ret = 'PyNone' + return ret bus = dbus.SystemBus() -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org