calculate
/
calculate-utils-3-install
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix methodname

Browse Source
master3.3
Mike Hiretsky 12 years ago
parent 9b8f2f7ed5
commit 68a0aee540
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File

28
install/cl_wsdl_install.py
Unescape View File

@ -113,7 +113,7 @@ class Wsdl:
from calculate.core.server.decorators import Dec from calculate.core.server.decorators import Dec
def installCommon(self,sid,info,methodname,initfunc, def installCommon(self,sid,info,methodname,initfunc,
installFunc="installSystem",humanName=""): installFunc="installSystem"):
""" """
Install common method Install common method
""" """
@ -140,7 +140,7 @@ class Wsdl:
cl_install.Install, object), {}) cl_install.Install, object), {})
pid = self.startprocess(sid, target=install_meth, pid = self.startprocess(sid, target=install_meth,
method=installFunc,\ method=installFunc,\
method_name=humanName or _("System installing"), method_name=methodname or "install",
args_proc = (dv,)) args_proc = (dv,))
returnmess = ReturnedMessage(type = 'pid', message = pid) returnmess = ReturnedMessage(type = 'pid', message = pid)
returnmess.type = "pid" returnmess.type = "pid"
@ -158,8 +158,7 @@ class Wsdl:
gui=True,command='cl-install', gui=True,command='cl-install',
rights=['install']) rights=['install'])
def install ( self, sid, info): def install ( self, sid, info):
return self.installCommon(sid,info,'install',self.install_vars, return self.installCommon(sid,info,'install',self.install_vars)
humanName=_('System installing'))
def install_vars(self,dv=None): def install_vars(self,dv=None):
if not dv: if not dv:
@ -256,8 +255,7 @@ class Wsdl:
Install to flash Install to flash
""" """
return self.installCommon(sid,info,'install_flash', return self.installCommon(sid,info,'install_flash',
self.install_flash_vars, self.install_flash_vars)
humanName=_('Flash install'))
@rpc(Integer, ViewParams,_returns = ViewInfo) @rpc(Integer, ViewParams,_returns = ViewInfo)
@catchExcept @catchExcept
@ -294,8 +292,7 @@ class Wsdl:
Install to flash Install to flash
""" """
return self.installCommon(sid,info,'install_pxe', return self.installCommon(sid,info,'install_pxe',
self.install_pxe_vars, self.install_pxe_vars)
humanName=_('PXE install'))
@rpc(Integer, ViewParams,_returns = ViewInfo) @rpc(Integer, ViewParams,_returns = ViewInfo)
@catchExcept @catchExcept
@ -338,8 +335,7 @@ class Wsdl:
print "OINRD",info.os_install_net_route_data print "OINRD",info.os_install_net_route_data
return self.installCommon(sid,info,'configure_network', return self.installCommon(sid,info,'configure_network',
self.configure_network_vars, self.configure_network_vars,
installFunc="setupSystem", installFunc="setupSystem")
humanName=_('Network'))
@rpc(Integer, ViewParams,_returns = ViewInfo) @rpc(Integer, ViewParams,_returns = ViewInfo)
@catchExcept @catchExcept
@ -379,8 +375,7 @@ class Wsdl:
""" """
return self.installCommon(sid,info,'configure_video', return self.installCommon(sid,info,'configure_video',
self.configure_video_vars, self.configure_video_vars,
installFunc="setupSystem", installFunc="setupSystem")
humanName=_('Video'))
@rpc(Integer, ViewParams,_returns = ViewInfo) @rpc(Integer, ViewParams,_returns = ViewInfo)
@catchExcept @catchExcept
@ -420,8 +415,7 @@ class Wsdl:
""" """
return self.installCommon(sid,info,'configure_locale', return self.installCommon(sid,info,'configure_locale',
self.configure_locale_vars, self.configure_locale_vars,
installFunc="setupSystem", installFunc="setupSystem")
humanName=_('Locale'))
@rpc(Integer, ViewParams,_returns = ViewInfo) @rpc(Integer, ViewParams,_returns = ViewInfo)
@catchExcept @catchExcept
@ -460,8 +454,7 @@ class Wsdl:
""" """
return self.installCommon(sid,info,'configure_boot', return self.installCommon(sid,info,'configure_boot',
self.configure_boot_vars, self.configure_boot_vars,
installFunc="setupSystem", installFunc="setupSystem")
humanName=_('Boot'))
@rpc(Integer, ViewParams,_returns = ViewInfo) @rpc(Integer, ViewParams,_returns = ViewInfo)
@catchExcept @catchExcept
@ -497,8 +490,7 @@ class Wsdl:
""" """
return self.installCommon(sid,info,'configure_system', return self.installCommon(sid,info,'configure_system',
self.configure_system_vars, self.configure_system_vars,
installFunc="setupSystem", installFunc="setupSystem")
humanName=_('System'))
@rpc(Integer, ViewParams,_returns = ViewInfo) @rpc(Integer, ViewParams,_returns = ViewInfo)
@catchExcept @catchExcept

Write Preview
Loading…
Cancel
Save